diff lisp/nxml/nxml-mode.el @ 106936:d8549f97592e

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 17 Jan 2010 21:57:00 +0000
parents 8357132d4077
children f6b8c73548b3
line wrap: on
line diff
--- a/lisp/nxml/nxml-mode.el	Thu Jan 14 23:01:38 2010 +0000
+++ b/lisp/nxml/nxml-mode.el	Sun Jan 17 21:57:00 2010 +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))