diff options
| author | Alan Mackenzie <acm@muc.de> | 2008-01-29 20:17:44 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2008-01-29 20:17:44 +0000 |
| commit | 820d062bde06707f66828166ebf97bbb123851b8 (patch) | |
| tree | ce7ee81c9e466dc0186dbdbba429174c450d4391 | |
| parent | d29cf86d3074248c077e4deaf49c1f4100e0fd25 (diff) | |
| download | emacs-820d062bde06707f66828166ebf97bbb123851b8.tar.gz | |
(c-guess-basic-syntax, CASE 5A.5): Anchor the "{" of a template function
correctly on "template", not the following "<".
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 929b000b83f..77b43657050 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -8030,12 +8030,15 @@ comment at the start of cc-engine.el for more info." ;; CASE 5A.5: ordinary defun open (t - (goto-char placeholder) - (if (or containing-decl-open macro-start) - (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))) - ))) + (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. (Resolved, + ;; 2007-11-09) + )))) ;; CASE 5B: After a function header but before the body (or ;; the ending semicolon if there's no body). |