merge revision(s) r44916: [Backport ruby#10043]

	error.c: Crash Report log

	* error.c (REPORTBUG_MSG): mention about Crash Report log file on
  MacOS X.

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

Author: nagachika

error.c

@@ -43,12 +43,17 @@ VALUE rb_eEINPROGRESS;
 
 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)

test/ruby/test_rubyoptions.rb

@@ -527,6 +527,7 @@ module SEGVTest
       \[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})

version.h

@@ -1,6 +1,6 @@
 #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