diff options
| author | Miles Bader <miles@gnu.org> | 2008-03-01 01:28:31 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-03-01 01:28:31 +0000 |
| commit | 51fb064bc72968e739e8dea580e58796c1a87f4c (patch) | |
| tree | 80c29b96dbb547a7c8db57a6d57ae4c6d2bfc1ca /lisp/progmodes/cc-mode.el | |
| parent | 14e8de0c3f87a228c05902be66c5bcf953636611 (diff) | |
| parent | 613f60eeb171e5ad881f52d9e7c0ffce2e182fcb (diff) | |
| download | emacs-51fb064bc72968e739e8dea580e58796c1a87f4c.tar.gz emacs-51fb064bc72968e739e8dea580e58796c1a87f4c.tar.bz2 emacs-51fb064bc72968e739e8dea580e58796c1a87f4c.zip | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
Diffstat (limited to 'lisp/progmodes/cc-mode.el')
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 607ee54e30f..2d8e66ab3fc 100644 --- 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 |