From: Alan Mackenzie <acm@muc.de>
To: Eli Zaretskii <eliz@gnu.org>, Michael Menefee <mpmenefee@gmail.com>
Cc: 34186-done@debbugs.gnu.org
Subject: bug#34186: 26.1; locking up
Date: Fri, 25 Jan 2019 16:30:07 +0000 [thread overview]
Message-ID: <20190125163007.GA21111@ACM> (raw)
In-Reply-To: <83imye6ji6.fsf@gnu.org>
Hello, Eli and Michael.
On Thu, Jan 24, 2019 at 19:41:21 +0200, Eli Zaretskii wrote:
> > From: Michael Menefee <mpmenefee@gmail.com>
> > Date: Thu, 24 Jan 2019 10:32:34 -0600
> > Cc: 34186@debbugs.gnu.org
> > I have found the minimum necessary to consistently reproduce. copy/paste this into something.c to see if you
> > get same results:
> > void *AVL_first(AVL_t *);
> > void *AVL_last(AVL_t *);
> > #define (<--- locks up with pressing open parenthesis
> Thanks, now I can reproduce this. Alan, please take a look.
I've committed the following fix to the emacs-26 branch. I'm closing
the bug.
@Michael: This patch should apply cleanly to your Emacs 26.1 version (in
directory .../emacs/lisp/progmodes). If you apply it, please
byte-compile the file before using it. (If you want any help with the
patching and/or byte-compiling, feel free to send me private email.)
commit 9078f34e84178553cd59bc03ac1b58cb56038436
Author: Alan Mackenzie <acm@muc.de>
Date: Fri Jan 25 16:14:00 2019 +0000
Fix a loop in c-fl-decl-start. This fixes bug #34186.
* lisp/progmodes/cc-mode.el (c-fl-decl-start) In the pair of operations
c-syntactic-skip-backward and c-forward-syntactic-ws, ensure the latter
doesn't come back to the position before the former, and break out of the
enclosing loop if it does.
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 8cbb4e8612..5283cfea6e 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1487,6 +1487,7 @@ c-fl-decl-start
;; lock context (etc.) fontification.
(goto-char pos)
(let ((lit-start (c-literal-start))
+ old-pos
(new-pos pos)
capture-opener
bod-lim bo-decl)
@@ -1509,12 +1510,14 @@ c-fl-decl-start
(while
;; Go to a less nested declaration each time round this loop.
(and
+ (setq old-pos (point))
(c-syntactic-skip-backward "^;{}" bod-lim t)
(> (point) bod-lim)
(progn (c-forward-syntactic-ws)
;; Have we got stuck in a comment at EOB?
(not (and (eobp)
(c-literal-start))))
+ (< (point) old-pos)
(progn (setq bo-decl (point))
(or (not (looking-at c-protection-key))
(c-forward-keyword-clause 1)))
--
Alan Mackenzie (Nuremberg, Germany).
prev parent reply other threads:[~2019-01-25 16:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-23 16:24 bug#34186: 26.1; locking up Michael Menefee
2019-01-24 14:45 ` Eli Zaretskii
2019-01-24 14:53 ` Michael Menefee
2019-01-24 16:32 ` Michael Menefee
2019-01-24 17:41 ` Eli Zaretskii
2019-01-24 18:06 ` Alan Mackenzie
2019-01-25 16:30 ` Alan Mackenzie [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190125163007.GA21111@ACM \
--to=acm@muc.de \
--cc=34186-done@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=mpmenefee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).