nagachika	2014-09-06 00:41:26 +0900 (Sat, 06 Sep 2014)

  New Revision: 47416

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47416

  Log:
    merge revision(s) r44916: [Backport #10043]
    
    error.c: Crash Report log
    
    * error.c (REPORTBUG_MSG): mention about Crash Report log file on
      MacOS X.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/error.c
    branches/ruby_2_1/test/ruby/test_rubyoptions.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/error.c
===================================================================
--- ruby_2_1/error.c	(revision 47415)
+++ ruby_2_1/error.c	(revision 47416)
@@ -43,12 +43,17 @@ VALUE rb_eEINPROGRESS; https://github.com/ruby/ruby/blob/trunk/ruby_2_1/error.c#L43
 
 extern const char ruby_description[];
 
-#define REPORTBUG_MSG \
+static const char REPORTBUG_MSG[] =
 	"[NOTE]\n" \
 	"You may have encountered a bug in the Ruby interpreter" \
 	" or extension libraries.\n" \
 	"Bug reports are welcome.\n" \
+	""
+#if defined __APPLE__
+	"Don't forget to include the above Crash Report log file.\n"
+#endif
 	"For details: http://www.ruby-lang.org/bugreport.html\n\n" \
+    ;
 
 static const char *
 rb_strerrno(int err)
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47415)
+++ ruby_2_1/version.h	(revision 47416)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-09-06"
-#define RUBY_PATCHLEVEL 223
+#define RUBY_PATCHLEVEL 224
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9
Index: ruby_2_1/test/ruby/test_rubyoptions.rb
===================================================================
--- ruby_2_1/test/ruby/test_rubyoptions.rb	(revision 47415)
+++ ruby_2_1/test/ruby/test_rubyoptions.rb	(revision 47416)
@@ -527,6 +527,7 @@ class TestRubyOptions < Test::Unit::Test https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/test_rubyoptions.rb#L527
       \[NOTE\]\n
       You\smay\shave\sencountered\sa\sbug\sin\sthe\sRuby\sinterpreter\sor\sextension\slibraries.\n
       Bug\sreports\sare\swelcome.\n
+      (?:.*\n)?
       For\sdetails:\shttp:\/\/.*\.ruby-lang\.org/.*\n
       \n
       (?:#{additional})

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44916


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/