diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-16 20:39:01 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-16 20:39:01 +0200 |
| commit | f019fb210628549b661bf7ebaa40e136df205af4 (patch) | |
| tree | 5980c8bf0e79063fabbb94dd5997cf043006a520 | |
| parent | dd88932771fc7b16428b185fe93f7f696b489c7e (diff) | |
| download | emacs-f019fb210628549b661bf7ebaa40e136df205af4.tar.gz | |
* simple.el (current-kill): Clarify what `interprogram-paste-function' does.
Apparently I forgot to check in simple.el last time and just checked
in the ChangeLog.
Fixes: debbugs:7500
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/simple.el | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a4c3f0c9217..06201dd4146 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/simple.el b/lisp/simple.el index 64333402924..5dbe1e39794 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -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 |