procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(c-in-function-trailer-p): Fix this: when a function return type contains

Browse source 
"struct", "union", etc.  c-end-of-defun goes too far forward.
This commit is contained in:
Alan Mackenzie 2007-04-19 17:35:16 +00:00
parent 0f13b47681
commit 8007b73c14
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/progmodes/cc-cmds.el
View file

@ -1360,10 +1360,24 @@ No indentation or other \"electric\" behavior is performed."
(and c-opt-block-decls-with-vars-key
(save-excursion
(c-syntactic-skip-backward "^;}" lim)
(and (eq (char-before) ?\})
(eq (car (c-beginning-of-decl-1 lim)) 'previous)
(looking-at c-opt-block-decls-with-vars-key)
(point)))))
(let ((eo-block (point))
bod)
(and (eq (char-before) ?\})
(eq (car (c-beginning-of-decl-1 lim)) 'previous)
(setq bod (point))
;; Look for struct or union or ... If we find one, it might
;; be the return type of a function, or the like. Exclude
;; this case.
(c-syntactic-re-search-forward
(concat "[;=\(\[{]\\|\\("
c-opt-block-decls-with-vars-key
"\\)")
eo-block t t t)
(match-beginning 1) ; Is there a "struct" etc., somewhere?
(not (eq (char-before) ?_))
(c-syntactic-re-search-forward "[;=\(\[{]" eo-block t t t)
(eq (char-before) ?\{)
bod)))))
(defun c-where-wrt-brace-construct ()
;; Determine where we are with respect to functions (or other brace