Fix return value of nxml-extend-after-change-region.

* nxml/nxml-mode.el (nxml-extend-after-change-region): Never return t (Bug#3898).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b370e03892f1f243f60663bba944802b8bd0427..0de07cd92e3a67f735d8ac5d57a96ced811ce41c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-16  Lennart Borgman  <lennart.borgman@gmail.com>
+
+       * nxml/nxml-mode.el (nxml-extend-after-change-region): Never
+       return t (Bug#3898).
+
 2010-01-16  Frédéric Perrin  <frederic.perrin@resel.fr>  (tiny change)
 
        * vc-dispatcher.el (vc-do-command): Set LC_MESSAGES, so that we

diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 9fefd304b44ac203ddbaf302477f8de3a6118c0a..8bcde7a3a22b99ea0c63184c7f6279006c1d1835 100644 (file)
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -882,16 +882,17 @@ Called with `font-lock-beg' and `font-lock-end' dynamically bound."
 (defun nxml-extend-after-change-region (start end pre-change-length)
   (unless nxml-degraded
     (setq nxml-last-fontify-end nil)
-
-    (nxml-with-degradation-on-error 'nxml-extend-after-change-region
-       (save-excursion
-         (save-restriction
-           (widen)
-           (save-match-data
-             (nxml-with-invisible-motion
-               (nxml-with-unmodifying-text-property-changes
-                  (nxml-extend-after-change-region1
-                   start end pre-change-length)))))))))
+    (let ((region (nxml-with-degradation-on-error
+                  'nxml-extend-after-change-region
+                  (save-excursion
+                    (save-restriction
+                      (widen)
+                      (save-match-data
+                        (nxml-with-invisible-motion
+                          (nxml-with-unmodifying-text-property-changes
+                            (nxml-extend-after-change-region1
+                             start end pre-change-length)))))))))
+      (if (consp region) region))))
 
 (defun nxml-extend-after-change-region1 (start end pre-change-length)
   (let* ((region (nxml-after-change1 start end pre-change-length))