upstream

2 files changed, 5 insertions, 2 deletions

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 52f18a89849..47ceec309f4 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -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)
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 0c86b68f1d9..374c9b434d1 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1155,7 +1155,8 @@ Note that the style variables are always made local to the buffer."
   ;; `c-set-fl-decl-start' for the detailed functionality.
   (cons (c-set-fl-decl-start beg) end))
 
-(defvar c-standard-font-lock-fontify-region-function nil
+(defvar c-standard-font-lock-fontify-region-function
+  (default-value 'font-lock-fontify-region-function)
   "Standard value of `font-lock-fontify-region-function'")
 
 (defun c-font-lock-fontify-region (beg end &optional verbose)