procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* lisp/subr.el (remove-yank-excluded-properties): put
`with-silent-modifications' around only the last three lines of code.
This commit is contained in:
Alan Mackenzie 2015-04-25 20:49:44 +00:00
parent 864573cafe
commit 45e571035b
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lisp/subr.el
View 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)