mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
add-log-current-defun): Skip the semicolon ``;'' for
enum/union/struct/class definition. Revert change to call `forward-sexp' multiple times.
This commit is contained in:
parent
5340648dac
commit
9b469b61ca
1 changed files with 7 additions and 13 deletions
|
|
@ -828,6 +828,10 @@ Has a preference of looking backwards."
|
|||
;; here is the position after the final }.
|
||||
(backward-sexp 1)
|
||||
(forward-sexp 1)
|
||||
;; Skip the semicolon ``;'' for
|
||||
;; enum/union/struct/class definition.
|
||||
(if (= (char-after (point)) ?\;)
|
||||
(forward-char 1))
|
||||
(setq previous-defun-end (point)))
|
||||
|
||||
(save-excursion
|
||||
|
|
@ -921,19 +925,9 @@ Has a preference of looking backwards."
|
|||
;; Include certain keywords if they
|
||||
;; precede the name.
|
||||
(setq middle (point))
|
||||
;; Single (forward-sexp -1) invocation is
|
||||
;; not enough for C++ member function defined
|
||||
;; as part of nested class and/or namespace
|
||||
;; like:
|
||||
;;
|
||||
;; void
|
||||
;; foo::bar::baz::bazz ()
|
||||
;; { ...
|
||||
;;
|
||||
;; Here we have to move the point to
|
||||
;; the beginning of foo, not bazz.
|
||||
(while (not (looking-back "\\(^\\|[ \t]\\)"))
|
||||
(forward-sexp -1))
|
||||
;; We tried calling `forward-sexp' in a loop
|
||||
;; but it causes inconsistency for C names.
|
||||
(forward-sexp -1)
|
||||
;; Is this C++ method?
|
||||
(when (and (< 2 middle)
|
||||
(string= (buffer-substring (- middle 2)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue