summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-07-10 19:51:27 +0000
committerGerd Moellmann <gerd@gnu.org>2001-07-10 19:51:27 +0000
commit19da29f9b5f2c927ab0988b679f3d9eb7d38c5b6 (patch)
treef8645fa955596f71b9a02b39ef2bd06fef74a41f
parent58f8612a80a720f00c25a024ddc72b9abeb24455 (diff)
downloademacs-19da29f9b5f2c927ab0988b679f3d9eb7d38c5b6.tar.gz
(c-indent-exp): Keep the indentation of the block
itself, i.e. only indent the contents in it.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/cc-cmds.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 924c35dae6c..7121f7a6a37 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,11 @@
* startup.el (normal-top-level): Don't operate on the initial
frame if we failed to create one.
+2001-07-10 Martin Stjernholm <bug-cc-mode@gnu.org>
+
+ * cc-cmds.el (c-indent-exp): Keep the indentation of the block
+ itself, i.e. only indent the contents in it.
+
2001-07-10 Markus Rost <rost@math.ohio-state.edu>
* mail/rmail.el (rmail-show-message): Show beginning of message in
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 273b7c55652..7e2a0c5acf9 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1541,10 +1541,14 @@ balanced expression is found."
(if (not start)
(unless shutup-p
(error "Cannot find start of balanced expression to indent"))
+ (goto-char start)
+ (forward-line)
+ (setq start (point))
(if (not end)
(unless shutup-p
(error "Cannot find end of balanced expression to indent"))
- (c-indent-region start end))))
+ (if (< start end)
+ (c-indent-region start end)))))
(goto-char here)
(set-marker here nil))))