aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2003-01-27 21:45:10 +0000
committerKim F. Storm2003-01-27 21:45:10 +0000
commit9dd10e259b1c1c8b03c7602d12fe4c982cf4d4ba (patch)
tree34ded69152cf00a4bde0fa68559c517687e5056c
parent2a262563661b44a04d25472fe82c843e2fa53074 (diff)
downloademacs-9dd10e259b1c1c8b03c7602d12fe4c982cf4d4ba.tar.gz
emacs-9dd10e259b1c1c8b03c7602d12fe4c982cf4d4ba.zip
(insert-for-yank): Remove COMMAND element from yank handler.
-rw-r--r--lisp/subr.el8
1 files changed, 2 insertions, 6 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index 39a6c4680de..8b0005a644f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1467,7 +1467,7 @@ Strip text properties from the inserted text according to
1467If STRING has a non-nil `yank-handler' property on the first character, 1467If STRING has a non-nil `yank-handler' property on the first character,
1468the normal insert behaviour is modified in various ways. The value of 1468the normal insert behaviour is modified in various ways. The value of
1469the yank-handler property must be a list with one to five elements 1469the yank-handler property must be a list with one to five elements
1470with the following format: (FUNCTION PARAM NOEXCLUDE UNDO COMMAND). 1470with the following format: (FUNCTION PARAM NOEXCLUDE UNDO).
1471When FUNCTION is present and non-nil, it is called instead of `insert' 1471When FUNCTION is present and non-nil, it is called instead of `insert'
1472 to insert the string. FUNCTION takes one argument--the object to insert. 1472 to insert the string. FUNCTION takes one argument--the object to insert.
1473If PARAM is present and non-nil, it replaces STRING as the object 1473If PARAM is present and non-nil, it replaces STRING as the object
@@ -1481,11 +1481,7 @@ If NOEXCLUDE is present and non-nil, the normal removal of the
1481If UNDO is present and non-nil, it is a function that will be called 1481If UNDO is present and non-nil, it is a function that will be called
1482 by `yank-pop' to undo the insertion of the current object. It is 1482 by `yank-pop' to undo the insertion of the current object. It is
1483 called with two arguments, the start and end of the current region. 1483 called with two arguments, the start and end of the current region.
1484 FUNCTION may set `yank-undo-function' to override the UNDO value. 1484 FUNCTION may set `yank-undo-function' to override the UNDO value."
1485If COMMAND is present and non-nil, `this-command' is set to COMMAND
1486 after calling FUNCTION (or insert). Note that setting `this-command'
1487 to a value different from `yank' will prevent `yank-pop' from undoing
1488 this yank."
1489 (let* ((handler (and (stringp string) 1485 (let* ((handler (and (stringp string)
1490 (get-text-property 0 'yank-handler string))) 1486 (get-text-property 0 'yank-handler string)))
1491 (param (or (nth 1 handler) string)) 1487 (param (or (nth 1 handler) string))