Mercurial > emacs
changeset 75359:9848399916bc
Correct the handling of K&R stuff in c-where-wrt-brace-construct.
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Sun, 21 Jan 2007 19:29:51 +0000 |
| parents | 7a7888bbf03d |
| children | 1e55e444c3d5 |
| files | lisp/progmodes/cc-cmds.el |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/cc-cmds.el Sun Jan 21 19:24:06 2007 +0000 +++ b/lisp/progmodes/cc-cmds.el Sun Jan 21 19:29:51 2007 +0000 @@ -1383,8 +1383,7 @@ ;; ;; This function might do hidden buffer changes. (save-excursion - (let* (pos - kluge-start + (let* (kluge-start decl-result brace-decl-p (start (point)) (paren-state (c-parse-state)) @@ -1417,11 +1416,12 @@ (setq kluge-start (point)) (setq decl-result (car (c-beginning-of-decl-1 + ;; NOTE: If we're in a K&R region, this might be the start + ;; of a parameter declaration, not the actual function. (and least-enclosing ; LIMIT for c-b-of-decl-1 (c-safe-position least-enclosing paren-state))))) ;; Has the declaration we've gone back to got braces? - (setq pos (point)) ; the search limit for c-recognize-knr-p (setq brace-decl-p (save-excursion (and (c-syntactic-re-search-forward "[;{]" nil t t) @@ -1431,7 +1431,7 @@ ;; ';' in a K&R argdecl. In ;; that case the declaration ;; should contain a block. - (c-in-knr-argdecl pos)))))) + (c-in-knr-argdecl)))))) (cond ((= (point) kluge-start) ; might be BOB or unbalanced parens.