comparison lisp/progmodes/cc-cmds.el @ 77317:ca9385224244

(c-in-function-trailer-p): Fix this: when a function return type contains "struct", "union", etc. c-end-of-defun goes too far forward.

77316:ae324f60a9cd

  ;;
  ;; This function might do hidden buffer changes.
  (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)))))

(defun c-where-wrt-brace-construct ()
  ;; Determine where we are with respect to functions (or other brace
  ;; constructs, included in the term "function" in the rest of this comment).
  ;; Point is assumed to be outside any macro or literal.

77317:ca9385224244

  ;;
  ;; This function might do hidden buffer changes.
  (and c-opt-block-decls-with-vars-key
       (save-excursion
	 (c-syntactic-skip-backward "^;}" lim)
	 (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
  ;; constructs, included in the term "function" in the rest of this comment).
  ;; Point is assumed to be outside any macro or literal.