Mercurial > emacs
changeset 107935:a228af19ba66
Reverse 99592: "Fix bug #5649: 23.1.92; Indentation problems in C mode.".
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Mon, 12 Apr 2010 14:55:18 +0000 |
| parents | 3b65ff258e7f |
| children | 10f6e25f2e26 |
| files | lisp/ChangeLog lisp/progmodes/cc-engine.el |
| diffstat | 2 files changed, 1 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Apr 12 14:48:07 2010 +0000 +++ b/lisp/ChangeLog Mon Apr 12 14:55:18 2010 +0000 @@ -293,11 +293,6 @@ (otf-script-alist): Likewise. (setup-default-fontset): Likewise. Re-fix :otf spec. -2010-03-01 Alan Mackenzie <bug-cc-mode@gnu.org> - - * cc-engine.el (c-remove-stale-state-cache): Take account of when - `good-pos' is in the same macro as `here'. Fixes bug#5649. - 2010-02-28 Katsumi Yamaoka <yamaoka@jpl.org> * menu-bar.el (menu-bar-manuals-menu): Fix typo.
--- a/lisp/progmodes/cc-engine.el Mon Apr 12 14:48:07 2010 +0000 +++ b/lisp/progmodes/cc-engine.el Mon Apr 12 14:55:18 2010 +0000 @@ -2641,8 +2641,7 @@ ;; (car c-state-cache). There can be no open parens/braces/brackets ;; between `good-pos'/`good-pos-actual-macro-start' and (point-max), ;; due to the interface spec to this function. - (setq pos (if (and good-pos-actual-macro-end - (> in-macro-start good-pos-actual-macro-start)) + (setq pos (if good-pos-actual-macro-end (1+ good-pos-actual-macro-end) ; get outside the macro as ; marked by a `category' text property. good-pos))