[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/syntax.c [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/syntax.c [emacs-unicode-2] |
Date: |
Thu, 04 Nov 2004 04:10:46 -0500 |
Index: emacs/src/syntax.c
diff -c emacs/src/syntax.c:1.166.4.7 emacs/src/syntax.c:1.166.4.8
*** emacs/src/syntax.c:1.166.4.7 Fri Oct 29 00:24:33 2004
--- emacs/src/syntax.c Thu Nov 4 08:55:31 2004
***************
*** 3023,3034 ****
INC_FROM;
code = prev_from_syntax & 0xff;
! 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;
}
else if (code == Scomment_fence)
{
--- 3023,3045 ----
INC_FROM;
code = prev_from_syntax & 0xff;
! 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. */
{
! /* 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)
{
***************
*** 3040,3063 ****
state.comstr_start = prev_from;
code = Scomment;
}
! else if (from < end)
! if (SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax))
! if (c1 = FETCH_CHAR_AS_MULTIBYTE (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;
! }
if (SYNTAX_FLAGS_PREFIX (prev_from_syntax))
continue;
--- 3051,3063 ----
state.comstr_start = prev_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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/syntax.c [emacs-unicode-2],
Miles Bader <=