* ChangeLog: remove conflict marker.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
tabify and fix typos

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
mkmf.rb: different strings from conflict markers

* lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different
  strings from conflict markers.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/ruby/test_settracefunc.rb: disable trace.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* doc/shell.rd, doc/shell.rd.ja: Removed stale doc files
* lib/shell.rb, lib/shell/*: Merge and updates docs from doc/shell.rd*


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/dl/lib/dl/func.rb (DL::Function#initialize, DL::Function#bind):
  ABI should be set by using CFunc#calltype even when Fiddle is used.
  When Fiddle is used and a block is given, name shoud not be ignored.
  [ruby-core:50562] [Bug #7514]
* ext/dl/lib/dl/import.rb (DL::Importer#bind_function): should respect
  abi and name when Fiddle is used.
* test/dl/test_func.rb (test_name_with_block): test for "name" method
  with giving a block.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38202 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/mkmf/test_have_library.rb: tests for have_library.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* remove trailing spaces.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
test_have_macro.rb: TestHaveMacro

* test/mkmf/test_have_macro.rb (TestMkmf::TestHaveMacro): rename.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
test_have_library.rb: assert_have_library

* test/mkmf/test_have_library.rb (assert_have_library): extract.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38206 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/mkmf/test_have_func.rb: tests for have_func.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/rdoc/parser/changelog.rb:  Parse more ChangeLog file variations.
* test/rdoc/test_rdoc_parser_changelog.rb:  Test for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/ruby/memory_status.rb: suppress warning.
  A patch from NAKAMURA Usaku.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
	* thread.c (rb_thread_s_async_interrupt_timing): have to check ints before jumpping out.
	* test/ruby/test_thread.rb (test_async_interrupt_with_return): add test
	  rescue has to catch a queued async exception at the time of return.
	* test/ruby/test_thread.rb (test_async_interrupt_with_break): add test
	  rescue has to catch a queued async exception at the time of break.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/dl/lib/dl/func.rb (DL::Function#bind): When Fiddle is used,
  @ptr should be updated. This fixes SEGV raised in DL::Function#call
  after calling DL::Function#bind. [Bug #7516] [ruby-dev:46708]
* test/dl/test_func.rb (test_bind): test for the above


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
fix typos and remove trailing spaces

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
vm.c: save blockprocval

* vm.c (rb_vm_make_proc): save the proc made from the given block so
  that it will not get collected.  [ruby-core:50545] [Bug #7507]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* gc.c (getrusage_time): uses clock_gettime() with
  CLOCK_PROCESS_CPUTIME_ID when available, which provides a 1ns
  precision on linux. [ruby-core:50495] [Bug #7500]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
add a contributor name

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/timeout.rb (Timeout#timeout): set
  async_interrupt_timeing(:on_blocking) by default.
  [Bug #7503] [ruby-core:50524]

* test/test_timeout.rb (#test_timeout_blocking): test for the above.
* test/test_timeout.rb (test_timeout_immediate): ditto
* test/test_timeout.rb (test_timeout_immediate2): ditto.

* NEWS: news for the above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e