GNU bug report logs - #6412
23.2; [patch] nXML indentation bug

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 6412 in the body.
You can then email your comments to 6412 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo <sdl.web <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: 23.2; [patch] nXML indentation bug
Date: Sun, 13 Jun 2010 14:56:01 +0100

The indentation behaviour in nxml is different from most of other modes
in that when current line has correct indentation the point stay still
instead of moving to the first non-blank char. The attached patch fixes
this problem with minor simplification.


diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 8919d92..36b5fe7 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -1372,12 +1372,9 @@ of the inserted start-tag or nil if none was inserted."
   "Indent current line as XML."
   (let ((indent (nxml-compute-indent))
 	(from-end (- (point-max) (point))))
-    (when (and indent
-	       (/= indent (current-indentation)))
-      (beginning-of-line)
-      (let ((bol (point)))
-	(skip-chars-forward " \t")
-	(delete-region bol (point)))
+    (skip-chars-forward " \t")
+    (when (and indent (/= indent (current-indentation)))
+      (delete-region (line-beginning-position) (point))
       (indent-to indent)
       (when (> (- (point-max) from-end) (point))
 	(goto-char (- (point-max) from-end))))))

Best wishes,

Leo

GNU Emacs 23.2.7 (x86_64-apple-darwin10.3.0, Carbon Version 1.6.0 AppKit 1038.29)
 of 2010-06-11 on Victoria.local

Message #8 received at 6412 <at> debbugs.gnu.org (full text, mbox):

From: Leo <sdl.web <at> gmail.com>
To: 6412 <at> debbugs.gnu.org
Subject: Re: 23.2; [patch] nXML indentation bug
Date: Sun, 13 Jun 2010 15:27:27 +0100

[Message part 1 (text/plain, inline)]

Please ignore the patch in previous email (sorry for this). Here is the
correct patch:

[0001-Fix-nxml-indent-line-to-be-consistent-with-other-mod.patch (text/x-patch, attachment)]

[Message part 3 (text/plain, inline)]

Leo

Message #11 received at 6412 <at> debbugs.gnu.org (full text, mbox):

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Leo <sdl.web <at> gmail.com>
Cc: 6412 <at> debbugs.gnu.org
Subject: Re: bug#6412: 23.2; [patch] nXML indentation bug
Date: Sun, 13 Jun 2010 21:43:59 -0400

> Please ignore the patch in previous email (sorry for this). Here is the
> correct patch:

Thanks, and sorry to let you wait.  I just installed a copy of that same
functionality from some other mode.  This should really be moved to
prog-mode so it can be shared by all major-modes.


        Stefan

Message #14 received at 6412 <at> debbugs.gnu.org (full text, mbox):

From: Leo <sdl.web <at> gmail.com>
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: 6412 <at> debbugs.gnu.org
Subject: Re: bug#6412: 23.2; [patch] nXML indentation bug
Date: Mon, 14 Jun 2010 09:15:14 +0100

On 14 June 2010 02:43, Stefan Monnier <monnier <at> iro.umontreal.ca> wrote:
>> Please ignore the patch in previous email (sorry for this). Here is the
>> correct patch:
>
> Thanks, and sorry to let you wait.  I just installed a copy of that same
> functionality from some other mode.  This should really be moved to
> prog-mode so it can be shared by all major-modes.

No wait at all. I think that's pretty quick. I tested the patch with
Emacs 23.2 and it worked. Please close this bug. Thanks.

>        Stefan

Leo

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.