]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix change from 2015-04-22 "On C-y, stop some text property entries ..."
authorAlan Mackenzie <acm@muc.de>
Sat, 25 Apr 2015 20:49:44 +0000 (20:49 +0000)
committerAlan Mackenzie <acm@muc.de>
Sat, 25 Apr 2015 20:49:44 +0000 (20:49 +0000)
* lisp/subr.el (remove-yank-excluded-properties): put
`with-silent-modifications' around only the last three lines of code.

lisp/subr.el

index 91176e9e805dc5821326d04c4796c8a048175c8c..0343edb068cc2a6a7aa4046cca9c7ab312d87ba5 100644 (file)
@@ -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)