Commit 621b9d6c authored by Chong Yidong's avatar Chong Yidong
Browse files

* lisp/simple.el (yank-pop-change-selection): Doc fix.

(interprogram-cut-function, interprogram-paste-function): Mention
that we typically mean the clipboard.

Fixes: debbugs:11361
parent 5a16b9bc
2012-07-07 Chong Yidong <cyd@gnu.org>
* simple.el (yank-pop-change-selection): Doc fix (Bug#11361).
(interprogram-cut-function, interprogram-paste-function): Mention
that we typically mean the clipboard.
2012-07-06 Glenn Morris <rgm@gnu.org> 2012-07-06 Glenn Morris <rgm@gnu.org>
   
* kmacro.el (kmacro-call-macro): Restore repeat message. (Bug#11817) * kmacro.el (kmacro-call-macro): Restore repeat message. (Bug#11817)
......
...@@ -3044,41 +3044,43 @@ be copied into other buffers." ...@@ -3044,41 +3044,43 @@ be copied into other buffers."
(defvar interprogram-cut-function nil (defvar interprogram-cut-function nil
"Function to call to make a killed region available to other programs. "Function to call to make a killed region available to other programs.
Most window systems provide a facility for cutting and pasting
text between different programs, such as the clipboard on X and
MS-Windows, or the pasteboard on Nextstep/Mac OS.
Most window systems provide some sort of facility for cutting and This variable holds a function that Emacs calls whenever text is
pasting text between the windows of different programs. put in the kill ring, to make the new kill available to other
This variable holds a function that Emacs calls whenever text programs. The function takes one argument, TEXT, which is a
is put in the kill ring, to make the new kill available to other string containing the text which should be made available.")
programs.
The function takes one argument, TEXT, which is a string containing
the text which should be made available.")
(defvar interprogram-paste-function nil (defvar interprogram-paste-function nil
"Function to call to get text cut from other programs. "Function to call to get text cut from other programs.
Most window systems provide a facility for cutting and pasting
Most window systems provide some sort of facility for cutting and text between different programs, such as the clipboard on X and
pasting text between the windows of different programs. MS-Windows, or the pasteboard on Nextstep/Mac OS.
This variable holds a function that Emacs calls to obtain
text that other programs have provided for pasting. This variable holds a function that Emacs calls to obtain text
that other programs have provided for pasting. The function is
The function should be called with no arguments. If the function called with no arguments. If no other program has provided text
returns nil, then no other program has provided such text, and the top to paste, the function should return nil (in which case the
of the Emacs kill ring should be used. If the function returns a caller, usually `current-kill', should use the top of the Emacs
string, then the caller of the function \(usually `current-kill') kill ring). If another program has provided text to paste, the
should put this string in the kill ring as the latest kill. function should return that text as a string (in which case the
caller should put this string in the kill ring as the latest
This function may also return a list of strings if the window kill).
The function may also return a list of strings if the window
system supports multiple selections. The first string will be system supports multiple selections. The first string will be
used as the pasted text, but the other will be placed in the used as the pasted text, but the other will be placed in the kill
kill ring for easy access via `yank-pop'. ring for easy access via `yank-pop'.
Note that the function should return a string only if a program other Note that the function should return a string only if a program
than Emacs has provided a string for pasting; if Emacs provided the other than Emacs has provided a string for pasting; if Emacs
most recent string, the function should return nil. If it is provided the most recent string, the function should return nil.
difficult to tell whether Emacs or some other program provided the If it is difficult to tell whether Emacs or some other program
current string, it is probably good enough to return nil if the string provided the current string, it is probably good enough to return
is equal (according to `string=') to the last text Emacs provided.") nil if the string is equal (according to `string=') to the last
text Emacs provided.")
...@@ -3184,7 +3186,10 @@ If `interprogram-cut-function' is set, pass the resulting kill to it." ...@@ -3184,7 +3186,10 @@ If `interprogram-cut-function' is set, pass the resulting kill to it."
(set-advertised-calling-convention 'kill-append '(string before-p) "23.3") (set-advertised-calling-convention 'kill-append '(string before-p) "23.3")
(defcustom yank-pop-change-selection nil (defcustom yank-pop-change-selection nil
"If non-nil, rotating the kill ring changes the window system selection." "Whether rotating the kill ring changes the window system selection.
If non-nil, whenever the kill ring is rotated (usually via the
`yank-pop' command), Emacs also calls `interprogram-cut-function'
to copy the new kill to the window system selection."
:type 'boolean :type 'boolean
:group 'killing :group 'killing
:version "23.1") :version "23.1")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment