Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-639
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-640
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-641
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-642
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-643
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-644
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-645
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-646
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-647
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-648
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-649
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-650
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-651
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-652
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-59
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-60
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-61
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-62
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-63
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-263

1 files changed, 22 insertions, 22 deletions

diff --git a/src/syntax.c b/src/syntax.c
index 272e9cf1b12..8bfa62b49fc 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -2799,12 +2799,23 @@ do { prev_from = from;				\
       INC_FROM;
       code = prev_from_syntax & 0xff;
 
-      if (code == Scomment)
+      if (from < end
+          && SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax)
+          && (c1 = FETCH_CHAR (from_byte),
+              SYNTAX_COMSTART_SECOND (c1)))
+        /* Duplicate code to avoid a complex if-expression
+           which causes trouble for the SGI compiler.  */
         {
-          state.comstyle = SYNTAX_FLAGS_COMMENT_STYLE (prev_from_syntax);
-          state.incomment = (SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax) ?
-                             1 : -1);
+          /* Record the comment style we have entered so that only
+             the comment-end sequence of the same style actually
+             terminates the comment section.  */
+          state.comstyle = SYNTAX_COMMENT_STYLE (c1);
+          comnested = SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax);
+          comnested = comnested || SYNTAX_COMMENT_NESTED (c1);
+          state.incomment = comnested ? 1 : -1;
           state.comstr_start = prev_from;
+          INC_FROM;
+          code = Scomment;
         }
       else if (code == Scomment_fence)
         {
@@ -2816,24 +2827,13 @@ do { prev_from = from;				\
           state.comstr_start = prev_from;
           code = Scomment;
         }
-     else if (from < end)
-        if (SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax))
-          if (c1 = FETCH_CHAR (from_byte),
-              SYNTAX_COMSTART_SECOND (c1))
-            /* Duplicate code to avoid a complex if-expression
-               which causes trouble for the SGI compiler.  */
-            {
-              /* Record the comment style we have entered so that only
-                 the comment-end sequence of the same style actually
-                 terminates the comment section.  */
-              state.comstyle = SYNTAX_COMMENT_STYLE (c1);
-              comnested = SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax);
-              comnested = comnested || SYNTAX_COMMENT_NESTED (c1);
-              state.incomment = comnested ? 1 : -1;
-              state.comstr_start = prev_from;
-              INC_FROM;
-              code = Scomment;
-            }
+      else if (code == Scomment)
+        {
+          state.comstyle = SYNTAX_FLAGS_COMMENT_STYLE (prev_from_syntax);
+          state.incomment = (SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax) ?
+                             1 : -1);
+          state.comstr_start = prev_from;
+        }
 
       if (SYNTAX_FLAGS_PREFIX (prev_from_syntax))
         continue;