diff options
| author | Alan Mackenzie | 2008-01-29 20:17:44 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2008-01-29 20:17:44 +0000 |
| commit | 820d062bde06707f66828166ebf97bbb123851b8 (patch) | |
| tree | ce7ee81c9e466dc0186dbdbba429174c450d4391 /lisp | |
| parent | d29cf86d3074248c077e4deaf49c1f4100e0fd25 (diff) | |
| download | emacs-820d062bde06707f66828166ebf97bbb123851b8.tar.gz emacs-820d062bde06707f66828166ebf97bbb123851b8.zip | |
(c-guess-basic-syntax, CASE 5A.5): Anchor the "{" of a template function
correctly on "template", not the following "<".
Diffstat (limited to 'lisp')
| -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." | |||
| 8030 | 8030 | ||
| 8031 | ;; CASE 5A.5: ordinary defun open | 8031 | ;; CASE 5A.5: ordinary defun open |
| 8032 | (t | 8032 | (t |
| 8033 | (goto-char placeholder) | 8033 | (save-excursion |
| 8034 | (if (or containing-decl-open macro-start) | 8034 | (c-beginning-of-decl-1 lim) |
| 8035 | (c-add-syntax 'defun-open (c-point 'boi)) | 8035 | (while (looking-at c-specifier-key) |
| 8036 | ;; Bogus to use bol here, but it's the legacy. | 8036 | (goto-char (match-end 1)) |
| 8037 | (c-add-syntax 'defun-open (c-point 'bol))) | 8037 | (c-forward-syntactic-ws indent-point)) |
| 8038 | ))) | 8038 | (c-add-syntax 'defun-open (c-point 'boi)) |
| 8039 | ;; Bogus to use bol here, but it's the legacy. (Resolved, | ||
| 8040 | ;; 2007-11-09) | ||
| 8041 | )))) | ||
| 8039 | 8042 | ||
| 8040 | ;; CASE 5B: After a function header but before the body (or | 8043 | ;; CASE 5B: After a function header but before the body (or |
| 8041 | ;; the ending semicolon if there's no body). | 8044 | ;; the ending semicolon if there's no body). |