]> git.eshelyaron.com Git - emacs.git/commit
Fix an infinite loop in c-end-of-macro. Should fix bug #36484
authorAlan Mackenzie <acm@muc.de>
Thu, 4 Jul 2019 13:18:51 +0000 (13:18 +0000)
committerAlan Mackenzie <acm@muc.de>
Thu, 4 Jul 2019 13:18:51 +0000 (13:18 +0000)
commit4bf4002906fe60fda35c5ea725ffc0463ca4c26b
tree7d5bd931e58bce4c94c6a8e33e61ece0b9f0ab82
parent5b48dab412c61980bca63a67a5d548d07e56b404
Fix an infinite loop in c-end-of-macro.  Should fix bug #36484

Also fix two faulty regexps, save-match-data, and check c-major-mode-is
'c++-mode where needed.

* lis/progmodes/cc-langs.el (c-last-c-comment-end-on-line-re)
(c-last-open-c-comment-start-on-line-re): Handle repeated *s in regexp
correctly.

* lisp/progmodes/cc-engine.el (c-beginning-of-macro, c-end-of-macro): Protect
the match-data with save-match-data around regexp operations.
(c-end-of-macro): In the loop handling multiline block comments, check a
comment actually is multiline.

* lisp/progmodes/cc-mode.el (c-depropertize-CPP): Only call
c-depropertize-raw-strings-in-region in C++ Mode.
lisp/progmodes/cc-engine.el
lisp/progmodes/cc-langs.el
lisp/progmodes/cc-mode.el