Commit b23c9e46 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(indent-c++-exp): Use calculate-c-indent-after-brace.

(c++-mode): Require c-mode.
parent c87b46a0
...@@ -320,6 +320,8 @@ Turning on C++ mode calls the value of the variable `c++-mode-hook' with ...@@ -320,6 +320,8 @@ Turning on C++ mode calls the value of the variable `c++-mode-hook' with
no args if that value is non-nil." no args if that value is non-nil."
(interactive) (interactive)
(kill-all-local-variables) (kill-all-local-variables)
;; This code depends on the old C mode.
(require 'c-mode)
(use-local-map c++-mode-map) (use-local-map c++-mode-map)
(set-syntax-table c++-mode-syntax-table) (set-syntax-table c++-mode-syntax-table)
(setq major-mode 'c++-mode (setq major-mode 'c++-mode
...@@ -801,7 +803,7 @@ Returns nil if line starts inside a string, t if in a comment." ...@@ -801,7 +803,7 @@ Returns nil if line starts inside a string, t if in a comment."
(if (= (char-after (car contain-stack)) ?{) (if (= (char-after (car contain-stack)) ?{)
(save-excursion (save-excursion
(goto-char (car contain-stack)) (goto-char (car contain-stack))
(setq val (+ c-indent-level (current-column)))) (setq val (calculate-c-indent-after-brace)))
(setq val (calculate-c++-indent (setq val (calculate-c++-indent
(if (car indent-stack) (if (car indent-stack)
(- (car indent-stack)))))) (- (car indent-stack))))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment