1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00

cc-engine.el (c-forward-objc-directive): Prevent looping in "#pragma mark

@implementation".
This commit is contained in:
Alan Mackenzie 2012-02-07 12:01:42 +00:00
parent 5b77774d02
commit 667ced3a2d
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2012-02-07 Alan Mackenzie <acm@muc.de>
* progmodes/cc-engine.el (c-forward-objc-directive): Prevent
looping in "#pragma mark @implementation".
2012-02-07 Michael Albinus <michael.albinus@gmx.de>
* notifications.el (notifications-on-closed-signal): Make `reason'

View File

@ -7396,6 +7396,7 @@ comment at the start of cc-engine.el for more info."
(let ((start (point))
start-char
(c-promote-possible-types t)
lim
;; Turn off recognition of angle bracket arglists while parsing
;; types here since the protocol reference list might then be
;; considered part of the preceding name or superclass-name.
@ -7423,6 +7424,7 @@ comment at the start of cc-engine.el for more info."
; (c-forward-token-2) ; 2006/1/13 This doesn't move if the token's
; at EOB.
(goto-char (match-end 0))
(setq lim (point))
(c-skip-ws-forward)
(c-forward-type))
@ -7447,7 +7449,7 @@ comment at the start of cc-engine.el for more info."
t))))
(progn
(c-backward-syntactic-ws)
(c-backward-syntactic-ws lim)
(c-clear-c-type-property start (1- (point)) 'c-decl-end)
(c-put-c-type-property (1- (point)) 'c-decl-end)
t)