merge revision(s) 33390:

	* proc.c (proc_call):  Fix documentation of Proc#call vs Proc#===.
	  [Ruby 1.9 - Bug #5349]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33391:

	* proc.c (proc_call):  Update documentation to match argument handling
	  of proc/Proc.new/lambda/->()


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33368:

	* gc.c (add_heap_slots, init_heap): reset heaps_inc zero when
	  heap slots are expanded by environment variable RUBY_HEAP_MIN_SLOTS.
	  [ruby-core:39777] [Bug #5380]

	* test/ruby/test_gc.rb (test_gc_parameter): add test for it.

	* test/ruby/envutil.rb (assert_normal_exit): add :child_env option to
	  enable pass environemnt variables to child process.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33379:

	* gc.c (rb_gc_set_params): output GC parameter change messages only
	  if -w/-v options are specified. these messages are output to stderr,
	  not to stdout. [ruby-core:39795] [Bug #5380]

	* test/ruby/test_gc.rb (test_gc_parameter): add test for it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33394:
------------------------------------------------------------------------
r33394 | naruse | 2011-10-03 21:25:04 -0400 (Mon, 03 Oct 2011) | 1 line

Fix test of gc introduced in r33379.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33386:

	* lib/rubygems:  Update to RubyGems 1.8.11.  Move Deprecate into the
	  Gem namespace.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33363:

	* array.c (ary_join_1): should not copy the encoding of non-string
	  element after string element.  [ruby-core:39776] [Bug #5379]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33364:
------------------------------------------------------------------------
r33364 | naruse | 2011-09-29 20:18:18 -0400 (Thu, 29 Sep 2011) | 1 line

Fix wrong expectaion of r33363.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r33264 from trunk into ruby_1_9_3.
--
* lib/pstore.rb (PStore): always open in binary mode even if
  default encodings are set.  [Bug #5311] [ruby-core:39503]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges 33352 from trunk into ruby_1_9_3.
--
* configure.in (pthread_np.h): needs pthread.h to be included
  previously on OpenBSD.  a patch by George Koehler <xkernigh AT
  netscape.net> at [ruby-core:39752].  [Bug #5376]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r33379 and r33395 from trunk into ruby_1_9_3.
--
* gc.c (rb_gc_set_params): output GC parameter change messages only
  if -w/-v options are specified. these messages are output to stderr,
  not to stdout. [ruby-core:39795] [Bug #5380]

* test/ruby/test_gc.rb (test_gc_parameter): add test for it.
--
* gc.c (rb_gc_set_params): ruby_verbose can be Qnil, so use RTEST.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33442 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2011-10-09

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r33398 from trunk into ruby_1_9_3.
--
* lib/time.rb (Time.strptime): use Time.at if d[:seconds] is set.
  Reported by Christopher Eberz. [ruby-core:39903] Bug #5399

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Skip test_array_literal. [Backport #5369]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2011-10-10

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) r33265:

	* lib/pstore.rb, test/test_pstore.rb: suppress warnings with -v.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33203:
------------------------------------------------------------------------
r33203 | naruse | 2011-09-06 04:11:21 -0400 (Tue, 06 Sep 2011) | 1 line

Use assert_operator to show clear message.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2011-10-11

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33296:

	* test/-ext-/old_thread_select/test_old_thread_select.rb:
	  select() with timeout may return early in old Linux kernels
	  with 250 Hz tickrate and no dynticks, so skip everything older
	  than 2.6.32 (which has long term support).
	  And, Make the timing assertions consistently use assert_operator with
	  timing difference in error message
	  Patch by Eric Wong. [Bug #5335] [ruby-core:39618]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Skip too heavy test.


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