From: Paul Eggert Date: Wed, 9 Jul 2014 23:39:58 +0000 (-0700) Subject: * syntax.c (back_comment): Use more-natural location for label. X-Git-Tag: emacs-25.0.90~2636^2~47 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=09880d8533e588da3388263f8c2360eb28ccc878;p=emacs.git * syntax.c (back_comment): Use more-natural location for label. --- diff --git a/src/ChangeLog b/src/ChangeLog index ceddf35450d..bcd004d9677 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2014-07-09 Paul Eggert + * syntax.c (back_comment): Use more-natural location for label. + * font.c, font.h (font_unparse_fcname): Now static. Define only if HAVE_XFT || HAVE_FREETYPE || HAVE_NS. 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, from_byte = comstart_byte; UPDATE_SYNTAX_TABLE_FORWARD (from - 1); } - else + else lossage: { struct lisp_parse_state state; - bool adjusted; - lossage: - adjusted = true; + bool adjusted = true; /* We had two kinds of string delimiters mixed up together. Decode this going forwards. Scan fwd from a known safe place (beginning-of-defun)