# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1389163070 18000
# Node ID 043ce378784948ff547e17a9db34a71032cfd31e
# Parent  c7fe55478e119a3bfc81232b72be93b754e192d2# Parent  1f072ae35ede74cacef9256a69488acf551085ca
maint: Periodic merge of stable to gui-release.

diff -r c7fe55478e11 -r 043ce3787849 libinterp/parse-tree/lex.ll
--- a/libinterp/parse-tree/lex.ll	Tue Jan 07 22:07:28 2014 -0500
+++ b/libinterp/parse-tree/lex.ll	Wed Jan 08 01:37:50 2014 -0500
@@ -2634,7 +2634,15 @@
     {
       comment_text = &yytxt[offset];
 
+      // finish_comment sets at_beginning_of_statement to true but
+      // that's not be correct if we are handling a continued
+      // statement.  Preserve the current state.
+
+      bool saved_bos = at_beginning_of_statement;
+
       finish_comment (octave_comment_elt::end_of_line);
+
+      at_beginning_of_statement = saved_bos;
     }
 
   decrement_promptflag ();
diff -r c7fe55478e11 -r 043ce3787849 test/parser.tst
--- a/test/parser.tst	Tue Jan 07 22:07:28 2014 -0500
+++ b/test/parser.tst	Wed Jan 08 01:37:50 2014 -0500
@@ -283,3 +283,7 @@
 %! xyz(1) = 1; xyz /= 1;
 %! assert (xyz, 1);
 
+%!test
+%! a = [97 ... % comment
+%!      'b'];
+%! assert (a, 'ab');