[Emacs-diffs] /srv/bzr/emacs/trunk r107165: cc-engine.el (c-forward-objc-directive): Prevent looping in "#pragma mark

[Alan Mackenzie]

------------------------------------------------------------
revno: 107165
committer: Alan Mackenzie <address@hidden>
branch nick: cc-mode
timestamp: Tue 2012-02-07 12:01:42 +0000
message:
  cc-engine.el (c-forward-objc-directive): Prevent looping in "#pragma mark
  @implementation".
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-engine.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-07 09:06:19 +0000
+++ b/lisp/ChangeLog    2012-02-07 12:01:42 +0000
@@ -1,3 +1,8 @@
+2012-02-07  Alan Mackenzie  <address@hidden>
+
+       * progmodes/cc-engine.el (c-forward-objc-directive): Prevent
+       looping in "#pragma mark @implementation".
+
 2012-02-07  Michael Albinus  <address@hidden>
 
        * notifications.el (notifications-on-closed-signal): Make `reason'

=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el       2012-01-31 21:59:58 +0000
+++ b/lisp/progmodes/cc-engine.el       2012-02-07 12:01:42 +0000
@@ -7396,6 +7396,7 @@
     (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 @@
 ;            (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 @@
                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)