(reindent-then-newline-and-indent): Delete space *after*

reindenting the first line.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 928091f64bd87c0411df72278e3ad398c78c7730..557e49eed2cfd3a22e3db3ae84698bec8097423f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,29 @@
+2003-10-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * simple.el (reindent-then-newline-and-indent): Delete space *after*
+       reindenting the first line.
+
 2003-10-25  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        * wid-edit.el (widget-default-delete): Always delete child widgets.
 
+2003-10-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * newcomment.el (comment-indent): Don't call indent-according-to-mode
+       if the line has code.
+       Don't try to line up with something that's too far left.
+
+       * progmodes/octave-mod.el (octave-comment-start): Simplify.
+       (octave-mode-syntax-table): Add % as a comment starter.
+       (octave-point): Remove.
+       (octave-in-comment-p, octave-in-string-p)
+       (octave-not-in-string-or-comment-p, calculate-octave-indent)
+       (octave-blink-matching-block-open, octave-auto-fill):
+       Use line-(beginning|end)-position instead.
+
 2003-10-23  Francesco Potort\e,Al\e(B  <pot@gnu.org>
 
-       * emacs-lisp/authors.el (authors-aliases): Added correct realname
+       * emacs-lisp/authors.el (authors-aliases): Add correct realname
        for Francesco Potort\e,Al\e(B.
 
 2003-10-23  Dave Love  <fx@gnu.org>
@@ -20,7 +39,7 @@
 
        * gdb-ui.el (gdb-current-language): New variable.
        (gdb-update-flag): Remove variable.
-       (gud-watch,gdb-frame-handler): Adapt for other languages (Fortran).
+       (gud-watch, gdb-frame-handler): Adapt for other languages (Fortran).
        (gdb-take-last-elt): Remove function.
        (gdb-dequeue-input): Avoid recursion by not using gdb-take-last-elt.
        (gdb-post-prompt): Check for variable object changes here.

diff --git a/lisp/simple.el b/lisp/simple.el
index b0d5f7295f9feecb8228ea5dfcccf38f44d8ea77..3d636de721a98a813a45d62bff770cda2c5a21ca 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -303,14 +303,14 @@ In programming language modes, this is the same as TAB.
 In some text modes, where TAB inserts a tab, this indents to the
 column specified by the function `current-left-margin'."
   (interactive "*")
-  (delete-horizontal-space t)
   (let ((pos (point)))
     ;; Be careful to insert the newline before indenting the line.
     ;; Otherwise, the indentation might be wrong.
     (newline)
     (save-excursion
       (goto-char pos)
-      (indent-according-to-mode))
+      (indent-according-to-mode)
+      (delete-horizontal-space t))
     (indent-according-to-mode)))
 
 (defun quoted-insert (arg)