aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-10-02 03:44:59 +0000
committerRichard M. Stallman1994-10-02 03:44:59 +0000
commita68ac8b57ae4be26656265679c6ce0cb8d75da21 (patch)
tree530d4990967e3e1b663352c2b59d50bc6ea39d2c
parentdf0b5ea16eff7eeefe0b9c2c6f675b81a49eb212 (diff)
downloademacs-a68ac8b57ae4be26656265679c6ce0cb8d75da21.tar.gz
emacs-a68ac8b57ae4be26656265679c6ce0cb8d75da21.zip
(indent-c++-exp): For public/private/protected,
don't do the case/label adjustment.
-rw-r--r--lisp/progmodes/cplus-md.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/progmodes/cplus-md.el b/lisp/progmodes/cplus-md.el
index 07db75eb822..8d1e8267042 100644
--- a/lisp/progmodes/cplus-md.el
+++ b/lisp/progmodes/cplus-md.el
@@ -694,13 +694,13 @@ Returns nil if line starts inside a string, t if in a comment."
694 (setq this-indent val)))) 694 (setq this-indent val))))
695 ;; Adjust line indentation according to its contents 695 ;; Adjust line indentation according to its contents
696 (if (looking-at "\\(public\\|private\\|protected\\):") 696 (if (looking-at "\\(public\\|private\\|protected\\):")
697 (setq this-indent (- this-indent c-indent-level))) 697 (setq this-indent (- this-indent c-indent-level))
698 (if (or (looking-at "case[ \t]") 698 (if (or (looking-at "case[ \t]")
699 (and (looking-at "[A-Za-z]") 699 (and (looking-at "[A-Za-z]")
700 (save-excursion 700 (save-excursion
701 (forward-sexp 1) 701 (forward-sexp 1)
702 (looking-at ":[^:]")))) 702 (looking-at ":[^:]"))))
703 (setq this-indent (max 1 (+ this-indent c-label-offset)))) 703 (setq this-indent (max 1 (+ this-indent c-label-offset)))))
704 (if (looking-at "friend[ \t]") 704 (if (looking-at "friend[ \t]")
705 (setq this-indent (+ this-indent c++-friend-offset))) 705 (setq this-indent (+ this-indent c++-friend-offset)))
706 (if (= (following-char) ?\}) 706 (if (= (following-char) ?\})