2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 050f1415d2..8ae7bbe3ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 22 23:33:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reg_compile_gen): always append error message to the
+	  error buffer.
+
 Sat Oct 22 22:33:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (num_funcall1): check recursion by inverse pair, to
diff --git a/parse.y b/parse.y
index e5e4be1503..5e6a659a25 100644
--- a/parse.y
+++ b/parse.y
@@ -10626,12 +10626,7 @@ reg_compile_gen(struct parser_params* parser, VALUE str, int options)
     if (NIL_P(re)) {
 	VALUE m = rb_attr_get(rb_errinfo(), idMesg);
 	rb_set_errinfo(err);
-	if (!NIL_P(err)) {
-	    rb_str_append(rb_str_cat(rb_attr_get(err, idMesg), "\n", 1), m);
-	}
-	else {
-	    compile_error(PARSER_ARG "%"PRIsVALUE, m);
-	}
+	compile_error(PARSER_ARG "%"PRIsVALUE, m);
 	return Qnil;
     }
     return re;