aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/simple.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index c0028a08233..b4d1d609bc7 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1856,7 +1856,7 @@ If the previous command was also a kill command,
1856the text killed this time appends to the text killed last time 1856the text killed this time appends to the text killed last time
1857to make one entry in the kill ring. 1857to make one entry in the kill ring.
1858 1858
1859In lisp code, optional third arg YANK-HANDLER specifies the yank-handler 1859In Lisp code, optional third arg YANK-HANDLER specifies the yank-handler
1860text property to be set on the killed text. See `insert-for-yank'." 1860text property to be set on the killed text. See `insert-for-yank'."
1861 (interactive "r") 1861 (interactive "r")
1862 (condition-case nil 1862 (condition-case nil
@@ -1965,7 +1965,10 @@ The argument is used for internal purposes; do not supply one."
1965 1965
1966(defvar yank-window-start nil) 1966(defvar yank-window-start nil)
1967(defvar yank-undo-function nil 1967(defvar yank-undo-function nil
1968 "If non-nil, function used by `yank-pop' to delete last stretch of yanked text.") 1968 "If non-nil, function used by `yank-pop' to delete last stretch of yanked text.
1969Function is called with two parameters, START and END corresponding to
1970the value of the mark and point; it is guaranteed that START <= END.
1971Normally set from the UNDO element of a yank-handler; see `insert-for-yank'.")
1969 1972
1970(defun yank-pop (arg) 1973(defun yank-pop (arg)
1971 "Replace just-yanked stretch of killed text with a different stretch. 1974 "Replace just-yanked stretch of killed text with a different stretch.