[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-engine.el, v [EMACS_22_BASE]

[Alan Mackenzie]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Alan Mackenzie <acmacm> 08/01/29 20:17:45

Index: cc-engine.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-engine.el,v
retrieving revision 1.56.2.8
retrieving revision 1.56.2.9
diff -u -b -r1.56.2.8 -r1.56.2.9
--- cc-engine.el        27 Jan 2008 17:02:06 -0000      1.56.2.8
+++ cc-engine.el        29 Jan 2008 20:17:44 -0000      1.56.2.9
@@ -8030,12 +8030,15 @@
 
             ;; CASE 5A.5: ordinary defun open
             (t
-             (goto-char placeholder)
-             (if (or containing-decl-open macro-start)
+             (save-excursion
+               (c-beginning-of-decl-1 lim)
+               (while (looking-at c-specifier-key)
+                 (goto-char (match-end 1))
+                 (c-forward-syntactic-ws indent-point))
                  (c-add-syntax 'defun-open (c-point 'boi))
-               ;; Bogus to use bol here, but it's the legacy.
-               (c-add-syntax 'defun-open (c-point 'bol)))
-             )))
+               ;; Bogus to use bol here, but it's the legacy.  (Resolved,
+               ;; 2007-11-09)
+               ))))
 
           ;; CASE 5B: After a function header but before the body (or
           ;; the ending semicolon if there's no body).