* lisp/nxml/nxml-mode.el (nxml-electric-slash): Reindent when completion is

enabled.  Suggested by James Ahlborn <jahlborn@gmail.com>.

Fixes: debbugs:8704

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1ec662bac89a9ce0d025793c945a46dc249ea17..652c0d3d2640836b336161e19f8f1c2f522d08b1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * nxml/nxml-mode.el (nxml-electric-slash): Reindent when completion is
+       enabled.  Suggested by James Ahlborn <jahlborn@gmail.com> (bug#8704).
+
 2011-05-20  Nix  <nix@esperi.org.uk>
 
        * files.el (basic-save-buffer-2):

diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 993a6f7a2ab96b0bd3cc25dba40c1205441cca61..93e5f9d25f44253d261cf1a34979a4d5ba6b394b 100644 (file)
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -1263,9 +1263,9 @@ on the line, reindent the line."
                (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.