From: Chong Yidong Date: Sat, 16 Jan 2010 22:24:05 +0000 (-0500) Subject: Fix return value of nxml-extend-after-change-region. X-Git-Tag: emacs-pretest-23.1.92~35^2~18 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=116bd1ee3b91b4b9ad2361f689f2c47e09839591;p=emacs.git 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 8b370e03892..0de07cd92e3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-01-16 Lennart Borgman + + * nxml/nxml-mode.el (nxml-extend-after-change-region): Never + return t (Bug#3898). + 2010-01-16 Frédéric Perrin (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 9fefd304b44..8bcde7a3a22 100644 --- 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))