# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 740290155 0
# Node ID ea9d3f2cd5faf62c980a4ab899a3bf4fb4c40aea
# Parent  374fc1ccdc3f0711eca833af83feb56f324de510
(scan_lists, Fforward_comment): #if 0 the code
to treat two-character comment enders with a special shortcut.

(scan_sexps_forward): Set state.comstart to before the
comment starter, not after.

diff -r 374fc1ccdc3f -r ea9d3f2cd5fa src/syntax.c
--- a/src/syntax.c	Thu Jun 17 02:59:54 1993 +0000
+++ b/src/syntax.c	Thu Jun 17 04:09:15 1993 +0000
@@ -684,6 +684,7 @@
 
 	  if (code == Sendcomment && !quoted)
 	    {
+#if 0
 	      if (code != SYNTAX (c))
 		/* For a two-char comment ender, we can assume
 		   it does end a comment.  So scan back in a simple way.  */
@@ -709,6 +710,7 @@
 		    }
 		  break;
 		}
+#endif /* 0 */
 
 	      /* Look back, counting the parity of string-quotes,
 		 and recording the comment-starters seen.
@@ -1076,6 +1078,7 @@
 	    case Sendcomment:
 	      if (!parse_sexp_ignore_comments)
 		break;
+#if 0
 	      if (code != SYNTAX (c))
 		/* For a two-char comment ender, we can assume
 		   it does end a comment.  So scan back in a simple way.  */
@@ -1096,6 +1099,7 @@
 		    }
 		  break;
 		}
+#endif /* 0 */
 
 	      /* Look back, counting the parity of string-quotes,
 		 and recording the comment-starters seen.
@@ -1410,14 +1414,18 @@
     {
       code = SYNTAX (FETCH_CHAR (from));
       from++;
-      if (from < end && SYNTAX_COMSTART_FIRST (FETCH_CHAR (from - 1))
-	  && SYNTAX_COMSTART_SECOND (FETCH_CHAR (from)))
+      if (code == Scomment)
+	state.comstart = from-1;
+      
+      else if (from < end && SYNTAX_COMSTART_FIRST (FETCH_CHAR (from - 1))
+	       && SYNTAX_COMSTART_SECOND (FETCH_CHAR (from)))
 	{
 	  /* Record the comment style we have entered so that only
 	     the comment-end sequence of the same style actually
 	     terminates the comment section.  */
 	  code = Scomment;
 	  state.comstyle = SYNTAX_COMMENT_STYLE (FETCH_CHAR (from));
+	  state.comstart = from-1;
 	  from++;
 	}
 
@@ -1471,7 +1479,6 @@
 
 	case Scomment:
 	  state.incomment = 1;
-	  state.comstart = from;
 	startincomment:
 	  if (commentstop)
 	    goto done;