diff options
| author | Alan Mackenzie | 2014-11-06 09:05:58 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2014-11-06 09:05:58 -0500 |
| commit | 10c5eacef055876f2512ae809cc8b9a54fb4b335 (patch) | |
| tree | 024c3ae78b970e59a1690a258b25b5db94135b63 /src | |
| parent | 5b9c3a5767c6c988332def4a123f0c343628e330 (diff) | |
| download | emacs-10c5eacef055876f2512ae809cc8b9a54fb4b335.tar.gz emacs-10c5eacef055876f2512ae809cc8b9a54fb4b335.zip | |
* src/syntax.c (back_comment): Fix off-by-one error.
Fixes: debbugs:18022
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/syntax.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0b2f511d61f..a812fd4a771 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-11-06 Alan Mackenzie <acm@muc.de> | ||
| 2 | |||
| 3 | * syntax.c (back_comment): Fix off-by-one error (bug#18022). | ||
| 4 | |||
| 1 | 2014-11-06 Dima Kogan <dima@secretsauce.net> | 5 | 2014-11-06 Dima Kogan <dima@secretsauce.net> |
| 2 | 6 | ||
| 3 | * xgselect.c (xg_select): Use g_main_context_acquire (bug#18861). | 7 | * xgselect.c (xg_select): Use g_main_context_acquire (bug#18861). |
diff --git a/src/syntax.c b/src/syntax.c index 5e697d350ff..760f03c6b69 100644 --- a/src/syntax.c +++ b/src/syntax.c | |||
| @@ -825,7 +825,7 @@ back_comment (ptrdiff_t from, ptrdiff_t from_byte, ptrdiff_t stop, | |||
| 825 | { | 825 | { |
| 826 | from = comment_end; | 826 | from = comment_end; |
| 827 | from_byte = comment_end_byte; | 827 | from_byte = comment_end_byte; |
| 828 | UPDATE_SYNTAX_TABLE_FORWARD (comment_end - 1); | 828 | UPDATE_SYNTAX_TABLE_FORWARD (comment_end); |
| 829 | } | 829 | } |
| 830 | /* If comstart_pos is set and we get here (ie. didn't jump to `lossage' | 830 | /* If comstart_pos is set and we get here (ie. didn't jump to `lossage' |
| 831 | or `done'), then we've found the beginning of the non-nested comment. */ | 831 | or `done'), then we've found the beginning of the non-nested comment. */ |