(c-indent-exp): Keep the indentation of the block

itself, i.e. only indent the contents in it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 924c35dae6ccfb547e1b0b69fbec44461882c855..7121f7a6a3759ef343586c135d2df0fa7d6bb984 100644 (file)
--- 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 273b7c556520992aaf9c669c6121c430ebbcabe5..7e2a0c5acf916c0dc4b0e7f45d52e5c6cfa8d0bc 100644 (file)
--- 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))))