Merge from emacs--rel--22

[gnu-emacs] / lisp / progmodes / cc-mode.el

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 607ee54e30f4b00bce46be3e511e66f3a3e57243..2d8e66ab3fc266760400d64cd10699f8264266b9 100644 (file)
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -848,13 +848,11 @@ Note that the style variables are always made local to the buffer."
     (if (setq limits (c-literal-limits))
        (goto-char (cdr limits)))
 
-    (while (and (< (point) end)
-               (search-forward-regexp c-anchored-cpp-prefix end t))
+    (while (search-forward-regexp c-anchored-cpp-prefix end t)
       (when (c-beginning-of-macro)    ; Guard against being in a string/comment.
        (setq mbeg (point))
        (c-end-of-macro)          ; Do we need to go forward 1 char here?  No!
-       (c-neutralize-CPP-line mbeg (point)))
-      (forward-char))))                ; We might still be in a comment - this is OK.
+       (c-neutralize-CPP-line mbeg (point)))))) ; We might still be in a comment - this is OK.
 
 (defun c-before-change (beg end)
   ;; Function to be put on `before-change-function'.  Primarily, this calls