diff options
| author | Paul Eggert | 2014-07-09 16:39:58 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-07-09 16:39:58 -0700 |
| commit | 09880d8533e588da3388263f8c2360eb28ccc878 (patch) | |
| tree | 5a364102bc6b4a210b25e93d84ba9203a042a27e /src | |
| parent | f507537736f08249486a8f6d3c8b7401dd4e0b0d (diff) | |
| download | emacs-09880d8533e588da3388263f8c2360eb28ccc878.tar.gz emacs-09880d8533e588da3388263f8c2360eb28ccc878.zip | |
* syntax.c (back_comment): Use more-natural location for label.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/syntax.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ceddf35450d..bcd004d9677 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-07-09 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2014-07-09 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * syntax.c (back_comment): Use more-natural location for label. | ||
| 4 | |||
| 3 | * font.c, font.h (font_unparse_fcname): Now static. | 5 | * font.c, font.h (font_unparse_fcname): Now static. |
| 4 | Define only if HAVE_XFT || HAVE_FREETYPE || HAVE_NS. | 6 | Define only if HAVE_XFT || HAVE_FREETYPE || HAVE_NS. |
| 5 | 7 | ||
diff --git a/src/syntax.c b/src/syntax.c index 0ee48bb3725..4166ee211c7 100644 --- a/src/syntax.c +++ b/src/syntax.c | |||
| @@ -835,12 +835,10 @@ back_comment (ptrdiff_t from, ptrdiff_t from_byte, ptrdiff_t stop, | |||
| 835 | from_byte = comstart_byte; | 835 | from_byte = comstart_byte; |
| 836 | UPDATE_SYNTAX_TABLE_FORWARD (from - 1); | 836 | UPDATE_SYNTAX_TABLE_FORWARD (from - 1); |
| 837 | } | 837 | } |
| 838 | else | 838 | else lossage: |
| 839 | { | 839 | { |
| 840 | struct lisp_parse_state state; | 840 | struct lisp_parse_state state; |
| 841 | bool adjusted; | 841 | bool adjusted = true; |
| 842 | lossage: | ||
| 843 | adjusted = true; | ||
| 844 | /* We had two kinds of string delimiters mixed up | 842 | /* We had two kinds of string delimiters mixed up |
| 845 | together. Decode this going forwards. | 843 | together. Decode this going forwards. |
| 846 | Scan fwd from a known safe place (beginning-of-defun) | 844 | Scan fwd from a known safe place (beginning-of-defun) |