[Emacs-diffs] /srv/bzr/emacs/trunk r99353: Fix return value of nxml-extend-after-change-region.

[Chong Yidong]

------------------------------------------------------------
revno: 99353
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-01-16 17:24:05 -0500
message:
  Fix return value of nxml-extend-after-change-region.
  
  * nxml/nxml-mode.el (nxml-extend-after-change-region): Never return t 
(Bug#3898).
modified:
  lisp/ChangeLog
  lisp/nxml/nxml-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-16 21:38:47 +0000
+++ b/lisp/ChangeLog    2010-01-16 22:24:05 +0000
@@ -1,3 +1,8 @@
+2010-01-16  Lennart Borgman  <address@hidden>
+
+       * nxml/nxml-mode.el (nxml-extend-after-change-region): Never
+       return t (Bug#3898).
+
 2010-01-16  Frédéric Perrin  <address@hidden>  (tiny change)
 
        * vc-dispatcher.el (vc-do-command): Set LC_MESSAGES, so that we

=== modified file 'lisp/nxml/nxml-mode.el'
--- a/lisp/nxml/nxml-mode.el    2010-01-13 08:35:10 +0000
+++ b/lisp/nxml/nxml-mode.el    2010-01-16 22:24:05 +0000
@@ -882,16 +882,17 @@
 (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))