* 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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4c3f0c9217eec2640ab5ddf61e633660f4e19fd..06201dd41463bbf48ebc29a910fb7a6991fc42a3 100644 (file)
--- 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 643334029247d25c013e86bcf9a4689ae26737f0..5dbe1e397948f2375e5d5a422c7239739516b841 100644 (file)
--- 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