From: Alan Mackenzie <acm@muc.de>
Date: Sat, 25 Apr 2015 20:49:44 +0000 (+0000)
Subject: Fix change from 2015-04-22 "On C-y, stop some text property entries ..."
X-Git-Tag: emacs-25.0.90~2298
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=45e571035bffc0db059b1d686830da89df3d2d48;p=emacs.git

Fix change from 2015-04-22 "On C-y, stop some text property entries ..."

* lisp/subr.el (remove-yank-excluded-properties): put
`with-silent-modifications' around only the last three lines of code.
---

diff --git a/lisp/subr.el b/lisp/subr.el
index 91176e9e805..0343edb068c 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2811,21 +2811,21 @@ if it's an autoloaded macro."
   "Process text properties between START and END, inserted for a `yank'.
 Perform the handling specified by `yank-handled-properties', then
 remove properties specified by `yank-excluded-properties'."
-  (with-silent-modifications
-    (let ((inhibit-read-only t))
-      (dolist (handler yank-handled-properties)
-	(let ((prop (car handler))
-	      (fun  (cdr handler))
-	      (run-start start))
-	  (while (< run-start end)
-	    (let ((value (get-text-property run-start prop))
-		  (run-end (next-single-property-change
-			    run-start prop nil end)))
-	      (funcall fun value run-start run-end)
-	      (setq run-start run-end)))))
+  (let ((inhibit-read-only t))
+    (dolist (handler yank-handled-properties)
+      (let ((prop (car handler))
+            (fun  (cdr handler))
+            (run-start start))
+        (while (< run-start end)
+          (let ((value (get-text-property run-start prop))
+                (run-end (next-single-property-change
+                          run-start prop nil end)))
+            (funcall fun value run-start run-end)
+            (setq run-start run-end)))))
+    (with-silent-modifications
       (if (eq yank-excluded-properties t)
-	  (set-text-properties start end nil)
-	(remove-list-of-text-properties start end yank-excluded-properties)))))
+          (set-text-properties start end nil)
+        (remove-list-of-text-properties start end yank-excluded-properties)))))
 
 (defvar yank-undo-function)