From 644ea4df736e15bd2163ed8cc2b9fb1626b784d2 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Sun, 21 Dec 1997 01:34:37 +0000
Subject: [PATCH] Comment and whitespace changes.

---
 src/syntax.c | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/syntax.c b/src/syntax.c
index 58932ff24a1..d3d6f5b0ba5 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -2308,7 +2308,9 @@ This includes chars with \"quote\" or \"prefix\" syntax (' or p).")
    assuming that FROM has state OLDSTATE (nil means FROM is start of function),
    and return a description of the state of the parse at END.
    If STOPBEFORE is nonzero, stop at the start of an atom.
-   If COMMENTSTOP is nonzero, stop at the start of a comment.  */
+   If COMMENTSTOP is 1, stop at the start of a comment.
+   If COMMENTSTOP is -1, stop at the start or end of a comment,
+   after the beginning of a string, or after the end of a string.  */
 
 static void
 scan_sexps_forward (stateptr, from, end, targetdepth,
@@ -2569,29 +2571,29 @@ scan_sexps_forward (stateptr, from, end, targetdepth,
 	  if (boundary_stop) goto done;
 	startinstring:
 	  {
-	      nofence = state.instring != ST_STRING_STYLE;
+	    nofence = state.instring != ST_STRING_STYLE;
 	    
-	      while (1)
-		  {
-		      int c;
+	    while (1)
+	      {
+		int c;
 
-		      if (from >= end) goto done;
-		      c = FETCH_CHAR (from);
-		      if (nofence && c == state.instring) break;
-		      UPDATE_SYNTAX_TABLE_FORWARD (from);
-		      switch (SWITCH_ENUM_CAST (SYNTAX (c)))
-			  {
-			  case Sstring_fence:
-			      if (!nofence) goto string_end;
-			      break;
-			  case Scharquote:
-			  case Sescape:
-			      INC_FROM;
-			    startquotedinstring:
-			      if (from >= end) goto endquoted;
-			  }
-		      INC_FROM;
+		if (from >= end) goto done;
+		c = FETCH_CHAR (from);
+		if (nofence && c == state.instring) break;
+		UPDATE_SYNTAX_TABLE_FORWARD (from);
+		switch (SWITCH_ENUM_CAST (SYNTAX (c)))
+		  {
+		  case Sstring_fence:
+		    if (!nofence) goto string_end;
+		    break;
+		  case Scharquote:
+		  case Sescape:
+		    INC_FROM;
+		  startquotedinstring:
+		    if (from >= end) goto endquoted;
 		  }
+		INC_FROM;
+	      }
 	  }
 	string_end:
 	  state.instring = -1;
-- 
2.39.2