aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mackenzie2015-04-25 20:49:44 +0000
committerAlan Mackenzie2015-04-25 20:49:44 +0000
commit45e571035bffc0db059b1d686830da89df3d2d48 (patch)
tree224ee8a2cccd9ebf1045498b269057958f43d083
parent864573cafeabec9ce9d79a7bb4eb60a94f303847 (diff)
downloademacs-45e571035bffc0db059b1d686830da89df3d2d48.tar.gz
emacs-45e571035bffc0db059b1d686830da89df3d2d48.zip
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.
-rw-r--r--lisp/subr.el28
1 files changed, 14 insertions, 14 deletions
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."
2811 "Process text properties between START and END, inserted for a `yank'. 2811 "Process text properties between START and END, inserted for a `yank'.
2812Perform the handling specified by `yank-handled-properties', then 2812Perform the handling specified by `yank-handled-properties', then
2813remove properties specified by `yank-excluded-properties'." 2813remove properties specified by `yank-excluded-properties'."
2814 (with-silent-modifications 2814 (let ((inhibit-read-only t))
2815 (let ((inhibit-read-only t)) 2815 (dolist (handler yank-handled-properties)
2816 (dolist (handler yank-handled-properties) 2816 (let ((prop (car handler))
2817 (let ((prop (car handler)) 2817 (fun (cdr handler))
2818 (fun (cdr handler)) 2818 (run-start start))
2819 (run-start start)) 2819 (while (< run-start end)
2820 (while (< run-start end) 2820 (let ((value (get-text-property run-start prop))
2821 (let ((value (get-text-property run-start prop)) 2821 (run-end (next-single-property-change
2822 (run-end (next-single-property-change 2822 run-start prop nil end)))
2823 run-start prop nil end))) 2823 (funcall fun value run-start run-end)
2824 (funcall fun value run-start run-end) 2824 (setq run-start run-end)))))
2825 (setq run-start run-end))))) 2825 (with-silent-modifications
2826 (if (eq yank-excluded-properties t) 2826 (if (eq yank-excluded-properties t)
2827 (set-text-properties start end nil) 2827 (set-text-properties start end nil)
2828 (remove-list-of-text-properties start end yank-excluded-properties))))) 2828 (remove-list-of-text-properties start end yank-excluded-properties)))))
2829 2829
2830(defvar yank-undo-function) 2830(defvar yank-undo-function)
2831 2831