Mercurial > emacs

changeset 14853:e263cca8d928

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(indent-c++-exp): Use calculate-c-indent-after-brace. (c++-mode): Require c-mode.
author Richard M. Stallman <rms@gnu.org>
date Thu, 21 Mar 1996 14:16:06 +0000
parents b65bb6d88e90
children 291cdb9b5e03
files lisp/progmodes/cplus-md.el
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/progmodes/cplus-md.el	Thu Mar 21 11:33:52 1996 +0000
+++ b/lisp/progmodes/cplus-md.el	Thu Mar 21 14:16:06 1996 +0000
@@ -320,6 +320,8 @@
 no args if that value is non-nil."
   (interactive)
   (kill-all-local-variables)
+  ;; This code depends on the old C mode.
+  (require 'c-mode)
   (use-local-map c++-mode-map)
   (set-syntax-table c++-mode-syntax-table)
   (setq major-mode 'c++-mode
@@ -801,7 +803,7 @@
 		(if (= (char-after (car contain-stack)) ?{)
 		    (save-excursion
 		      (goto-char (car contain-stack))
-		      (setq val (+ c-indent-level (current-column))))
+		      (setq val (calculate-c-indent-after-brace)))
 		  (setq val (calculate-c++-indent
 			     (if (car indent-stack)
 				 (- (car indent-stack))))))