From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: nuxdoors@cegetel.net Newsgroups: gmane.emacs.bugs Subject: Re: reindent-then-newline-and-indent doesn't indent properly in emacs 22.1 Date: Sun, 14 Oct 2007 15:23:20 +0200 Message-ID: <47121848.1060800@cegetel.net> References: <470FFCF1.5050201@cegetel.net> <4710849B.30104@gmx.at> <471145BA.6050600@cegetel.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7BIT X-Trace: ger.gmane.org 1192368248 15148 80.91.229.12 (14 Oct 2007 13:24:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 14 Oct 2007 13:24:08 +0000 (UTC) Cc: bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Oct 14 15:23:58 2007 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Ih3Rm-00014u-AA for geb-bug-gnu-emacs@m.gmane.org; Sun, 14 Oct 2007 15:23:58 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ih3Rf-0001nZ-AM for geb-bug-gnu-emacs@m.gmane.org; Sun, 14 Oct 2007 09:23:51 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ih3RX-0001lu-KU for bug-gnu-emacs@gnu.org; Sun, 14 Oct 2007 09:23:43 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ih3RW-0001lP-Re for bug-gnu-emacs@gnu.org; Sun, 14 Oct 2007 09:23:43 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ih3RW-0001lH-Hv for bug-gnu-emacs@gnu.org; Sun, 14 Oct 2007 09:23:42 -0400 Original-Received: from sp604003mt.neufgp.fr ([84.96.92.56] helo=smTp.neuf.fr) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ih3RW-0008DI-Fe for bug-gnu-emacs@gnu.org; Sun, 14 Oct 2007 09:23:42 -0400 Original-Received: from [84.98.229.112] by sp604003mt.gpm.neuf.ld (Sun Java System Messaging Server 6.2-5.05 (built Feb 16 2006)) with ESMTP id <0JPW007UDL798I32@sp604003mt.gpm.neuf.ld> for bug-gnu-emacs@gnu.org; Sun, 14 Oct 2007 15:23:33 +0200 (CEST) In-reply-to: <471145BA.6050600@cegetel.net> User-Agent: Icedove 1.5.0.12 (X11/20070607) X-detected-kernel: by monty-python.gnu.org: Windows 98 (3 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:16747 Archived-At: Here is the patch alone, hopefully without thunderbird mangling it. --- lisp/simple.el.orig 2007-05-27 16:35:51.000000000 +0200 +++ lisp/simple.el 2007-10-14 15:21:13.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 moving 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))) (defun quoted-insert (arg)