mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-13 03:06:23 -08:00
Code Issues Projects Releases Wiki Activity

* simple.el (current-kill): Clarify what `interprogram-paste-function' does.

Browse source 
Apparently I forgot to check in simple.el last time and just checked
in the ChangeLog.

Fixes: debbugs:7500
This commit is contained in:
Lars Magne Ingebrigtsen 2011-07-16 20:39:01 +02:00
parent dd88932771
commit f019fb2106
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-07-16 Lars Magne Ingebrigtsen <larsi@gnus.org>
* simple.el (current-kill): Clarify what
`interprogram-paste-function' does (bug#7500).
2011-07-16 Lawrence Mitchell <wence@gmx.li>
* emacs-lisp/cl-macs.el (defstruct): Ignore argument to setf

9
lisp/simple.el
View file

@ -3056,10 +3056,11 @@ If `interprogram-cut-function' is set, pass the resulting kill to it."
(defun current-kill (n &optional do-not-move)
"Rotate the yanking point by N places, and then return that kill.
If N is zero, `interprogram-paste-function' is set, and calling
it returns a string or list of strings, then that string (or
list) is added to the front of the kill ring and the string (or
first string in the list) is returned as the latest kill.
If N is zero and `interprogram-paste-function' is set to a
function that returns a string or a list of strings, and if that
function doesn't return nil, then that string (or list) is added
to the front of the kill ring and the string (or first string in
the list) is returned as the latest kill.
If N is not zero, and if `yank-pop-change-selection' is
non-nil, use `interprogram-cut-function' to transfer the