* eval.c (rb_eval): pre-evaluate argument for unambiguous

  evaluation order.  [ruby-dev:26383]

* lib/delegate.rb (Delegator::method_missing): forward unknown
  method to the destination.  suggested by
  <christophe.poucet@gmail.com>.  [ruby-talk:146776]

* process.c (detach_process_watcher): terminate process watcher
  thread right after rb_waitpid() succeed.  [ruby-talk:146430]


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

1 files changed, 1 insertions, 1 deletions

diff --git a/file.c b/file.c
index ddaca16b6e..f5a21a2619 100644
--- a/file.c
+++ b/file.c
@@ -1997,7 +1997,7 @@ sys_fail2(s1, s2)
 
     len = RSTRING(s1)->len + RSTRING(s2)->len + 5;
     buf = ALLOCA_N(char, len);
-    snprintf(buf, len, "%s or %s", RSTRING(s1)->ptr, RSTRING(s2)->ptr);
+    snprintf(buf, len, "(%s, %s)", RSTRING(s1)->ptr, RSTRING(s2)->ptr);
     rb_sys_fail(buf);
 }