[Emacs-diffs] /srv/bzr/emacs/trunk r104296: * lisp/nxml/nxml-mode.el (nxml-electric-slash): Reindent when completion is

[Stefan Monnier]

------------------------------------------------------------
revno: 104296
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8704
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-05-20 10:15:00 -0300
message:
  * lisp/nxml/nxml-mode.el (nxml-electric-slash): Reindent when completion is
  enabled.  Suggested by James Ahlborn <address@hidden>.
modified:
  lisp/ChangeLog
  lisp/nxml/nxml-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-20 00:51:46 +0000
+++ b/lisp/ChangeLog    2011-05-20 13:15:00 +0000
@@ -1,3 +1,8 @@
+2011-05-20  Stefan Monnier  <address@hidden>
+
+       * nxml/nxml-mode.el (nxml-electric-slash): Reindent when completion is
+       enabled.  Suggested by James Ahlborn <address@hidden> (bug#8704).
+
 2011-05-20  Nix  <address@hidden>
 
        * files.el (basic-save-buffer-2):

=== modified file 'lisp/nxml/nxml-mode.el'
--- a/lisp/nxml/nxml-mode.el    2011-01-26 08:36:39 +0000
+++ b/lisp/nxml/nxml-mode.el    2011-05-20 13:15:00 +0000
@@ -1263,9 +1263,9 @@
                (nxml-scan-error nil))
            (when (and (eq (nxml-token-before) (point))
                       (eq xmltok-type 'partial-empty-element))
-             (insert ">")))
-       (when (and end-tag-p at-indentation)
-         (nxml-indent-line))))))
+             (insert ">"))))
+      (when (and end-tag-p at-indentation)
+        (nxml-indent-line)))))
 
 (defun nxml-balanced-close-start-tag-block ()
   "Close the start-tag before point with `>' and insert a balancing end-tag.