(Fforward_comment): Undo the previous change, since cc-mode

depends on the previous behavior.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ca2b1d2585a0dc59847b3d966d61b9b81b81aac..b9e184fd75512040087ee75c1214b4514498d157 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-17  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * syntax.c (Fforward_comment): Undo the previous change, since cc-mode
+       depends on the previous behavior.
+
 2000-02-16  Gerd Moellmann  <gerd@gnu.org>
 
        * sysdep.c (vfork) [!HAVE_VFORK]: Removed.

diff --git a/src/syntax.c b/src/syntax.c
index 43f49dae9cfbe066a4951baa3581b25e3c121233..c7e60ce1894f199557d8f10b7ee4fee0854442bc 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1910,15 +1910,19 @@ between them, return t; otherwise return nil.")
                                    &out_charpos, &out_bytepos);
              if (found == -1)
                {
-                 /* Failure: we have to skip the one or two chars of the
+#if 0  /* cc-mode (and maybe others) relies on the bogus behavior.  */
+                 /* Failure: we should go back to the end of this
                     not-quite-endcomment.  */
                  if (SYNTAX(c) != code)
                    /* It was a two-char Sendcomment.  */
                    INC_BOTH (from, from_byte);
                  goto leave;
+#endif
                }
-             /* We have skipped one comment.  */
-             from = out_charpos, from_byte = out_bytepos;
+             else
+               /* We have skipped one comment.  */
+               from = out_charpos, from_byte = out_bytepos;
+             break;
            }
          else if (code != Swhitespace && code != Scomment)
            {