mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-28 07:50:48 -08:00
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
This commit is contained in:
commit
98c273ce1c
1 changed files with 5 additions and 1 deletions
|
|
@ -2390,6 +2390,8 @@ with // and /*, not more generic line and block comments."
|
|||
;; Go to a less nested declaration each time round this loop.
|
||||
(and
|
||||
(setq old-pos (point))
|
||||
;; The following form tries to move to the end of the previous
|
||||
;; declaration without moving outside of an enclosing {.
|
||||
(let (pseudo)
|
||||
(while
|
||||
(and
|
||||
|
|
@ -2404,7 +2406,9 @@ with // and /*, not more generic line and block comments."
|
|||
(setq pseudo (c-cheap-inside-bracelist-p (c-parse-state)))))))
|
||||
(goto-char pseudo))
|
||||
t)
|
||||
(>= (point) bod-lim)
|
||||
(or (> (point) bod-lim)
|
||||
(eq bod-lim (point-min)))
|
||||
;; Move forward to the start of the next declaration.
|
||||
(progn (c-forward-syntactic-ws)
|
||||
;; Have we got stuck in a comment at EOB?
|
||||
(not (and (eobp)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue