[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#24870: 26.0.50; parse-partial-sexp ignores comment-end
From: |
npostavs |
Subject: |
bug#24870: 26.0.50; parse-partial-sexp ignores comment-end |
Date: |
Tue, 13 Dec 2016 23:04:45 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) |
npostavs@users.sourceforge.net writes:
>
>
> I have tracked the issue down to scan_sexps_forward in syntax.c
Applying this change which reverts part of [1] seems to fix the issue:
--- i/src/syntax.c
+++ w/src/syntax.c
@@ -3192,7 +3192,11 @@ scan_sexps_forward (struct lisp_parse_state *state,
while (from < end)
{
- if (SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax)
+ INC_FROM;
+ code = prev_from_syntax & 0xff;
+
+ if (from < end
+ && SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax)
&& (c1 = FETCH_CHAR (from_byte),
syntax = SYNTAX_WITH_FLAGS (c1),
SYNTAX_FLAGS_COMSTART_SECOND (syntax)))
@@ -3213,8 +3217,6 @@ scan_sexps_forward (struct lisp_parse_state *state,
}
else
{
- INC_FROM;
- code = prev_from_syntax & 0xff;
if (code == Scomment_fence)
{
/* Record the comment style we have entered so that only
Alan, can you explain what the idea behind that change was?
I think it might correspond to this part of the commit message:
Reformulate code at the top of the main loop correctly to
recognize comment openers when starting in the middle of one.
[1]: 9dcf5998935c Sun Mar 20 13:19:48 2016 +0000
"Amend parse-partial-sexp correctly to handle two character comment delimiters"
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, Andreas Röhler, 2016/12/01
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, npostavs, 2016/12/13
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end,
npostavs <=
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, Andreas Röhler, 2016/12/14
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, Alan Mackenzie, 2016/12/14
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, Andreas Röhler, 2016/12/15
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, Eli Zaretskii, 2016/12/15
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, Alan Mackenzie, 2016/12/15
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, Andreas Röhler, 2016/12/15
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, Alan Mackenzie, 2016/12/14
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, Noam Postavsky, 2016/12/15
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, Alan Mackenzie, 2016/12/15
- bug#24870: 26.0.50; parse-partial-sexp ignores comment-end, npostavs, 2016/12/18