aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/syntax.c6
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 @@
12014-07-09 Paul Eggert <eggert@cs.ucla.edu> 12014-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)