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

depends on the previous behavior.

2 files changed, 12 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ca2b1d2585..b9e184fd755 100644
--- 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 43f49dae9cf..c7e60ce1894 100644
--- 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)
             {