bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: reindent-then-newline-and-indent doesn't indent properly in emacs 22


From: nuxdoors
Subject: Re: reindent-then-newline-and-indent doesn't indent properly in emacs 22.1
Date: Sun, 14 Oct 2007 14:46:41 +0200
User-agent: Icedove 1.5.0.12 (X11/20070607)

> The problem with this is that the first `indent-according-to-mode' may
> insert whitespace at the end of an otherwise empty line.  Try to invoke
> your function at the beginning of a non-empty line.

I take care of this in this new function by deleting spaces after
indenting the line around the point of initial breakage. I expect it has
now the same behaviour as before except for the minor bug. Please test.

I completed the doc string with a note one the automatic trailing space
deleting. Shouldn't that be stated or is it too obvious ?

(defun reindent-then-newline-and-indent ()
  "Reindent current line, insert newline deleting trailing spaces or tabs,
then indent the new line.
Indentation of both lines is done according to the current major mode,
which means calling the current value of `indent-line-function'.
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 "*")
  (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)
      ;; Beware of indentation functions which move point.
      (save-excursion
    (indent-according-to-mode))
      ;; Delete all trailing spaces or tabs introduced by the newline
command
      ;; or the new indentation. 0 is for no space.
      (just-one-space 0))
    (indent-according-to-mode)))

-----------------------------------------

--- lisp/simple.el.orig 2007-05-27 16:35:51.000000000 +0200
+++ lisp/simple.el      2007-10-14 14:38:20.000000000 +0200
@@ -618,7 +618,8 @@
   (indent-according-to-mode))

 (defun reindent-then-newline-and-indent ()
-  "Reindent current line, insert newline, then indent the new line.
+  "Reindent current line, insert newline deleting trailing spaces or tabs,
+then indent the new line.
 Indentation of both lines is done according to the current major mode,
 which means calling the current value of `indent-line-function'.
 In programming language modes, this is the same as TAB.
@@ -631,8 +632,12 @@
     (newline)
     (save-excursion
       (goto-char pos)
-      (indent-according-to-mode)
-      (delete-horizontal-space t))
+      ;; Beware of indentation functions which move point.
+      (save-excursion
+       (indent-according-to-mode))
+      ;; Delete all trailing spaces or tabs introduced by the newline
command
+      ;; or the new indentation.
+      (just-one-space 0))
     (indent-according-to-mode)))

 (defun quoted-insert (arg)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]