* lib/fileutils.rb: fix typo.

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Merge branch 'pullreq/129' into trunk

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/test/unit.rb, lib/test/unit/parallel.rb:
  generate error message (String) in parallel.rb instead of
  marshalling Exception. Fixes [Bug #6882] [ruby-dev:46054]

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

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* common.mk: fix failed to make with -j2.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
test_module.rb: workaround for ruby-mode.el

* test/ruby/test_module.rb (TestModule#test_undef): get rid of
  confusing ruby-mode.el by mixing special characters in //.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Merge branch 'trunk' of git://github.com/ruby/ruby into trunk
vm_insnhelper.c: iclass as klass in cfp

* vm_insnhelper.c (vm_call_method): follow iclasses as klass in cfp
  but not included modules.  [ruby-core:47241] [Bug #6891]
* vm_insnhelper.c (vm_call_bmethod): pass defined_class to follow
  proper ancestors.  [ruby-core:47241] [Bug #6891]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ChangeLog: fix commit miss.  remove duplicated entry.

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

* parse.y: more descriptive token names in syntax error messages.

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

* parse.y: more descriptive token names in syntax error messages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* re.c (rb_reg_initialize_m):  Update example to show that regexp
  options use | an not || to avoid confusion.


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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* re.c (rb_reg_initialize_m):  Forgot to update output for or'd-options
  example.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36742 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/csv.rb:  Fixes #161 on github
* lib/csv.rb:  You can now specify a pattern for :skip_lines.
  Matching lines will not be passed to the CSV parser.
* lib/csv.rb:  Patch by Christian Schwartz.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Fixed warning for implicit conversion from size_t to int

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/testunit/tests_for_parallel/ptest_forth.rb: added a test case
  which causes an error.

* test/testunit/test_parallel.rb: follow above change.
  see [Bug #6882]


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