mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-21 18:23:59 +00:00
Code Issues Releases Activity

(calculate-c++-indent): Skip over paren-group

Browse Source 
when looking back to determine context of a top-level line.
Don't treat a line starting with } as a continuation.
This commit is contained in:
Richard M. Stallman 1995-10-19 22:04:18 +00:00
parent cf693838bd
commit 0d48fc0afc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/progmodes/cplus-md.el
View File

@ -563,6 +563,8 @@ Returns nil if line starts inside a string, t if in a comment."
(backward-char 1))
(if (= (preceding-char) ?})
0
(if (= (preceding-char) ?\))
(forward-list -1))
(beginning-of-line) ; continued arg decls or member inits
(skip-chars-forward " \t")
(if (= (following-char) ?:)
@ -608,7 +610,14 @@ Returns nil if line starts inside a string, t if in a comment."
;; Statement. Find previous non-comment character.
(goto-char indent-point)
(c++-backward-to-noncomment containing-sexp)
(if (not (memq (preceding-char) '(nil ?\, ?\; ?} ?: ?\{)))
(if (and (not (memq (preceding-char) '(0 ?\, ?\; ?\} ?\{)))
;; But don't treat a line with a close-brace
;; as a continuation. It is probably the
;; end of an enum type declaration.
(save-excursion
(goto-char indent-point)
(skip-chars-forward " \t")
(not (= (following-char) ?}))))
;; This line is continuation of preceding line's statement;
;; indent c-continued-statement-offset more than the
;; previous line of the statement.