diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/text.texi | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 2db58f31237..6dde4c00f85 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi | |||
| @@ -1142,7 +1142,7 @@ If @var{n} is zero, indicating a request for the latest kill, | |||
| 1142 | @code{current-kill} calls the value of | 1142 | @code{current-kill} calls the value of |
| 1143 | @code{interprogram-paste-function} (documented below) before | 1143 | @code{interprogram-paste-function} (documented below) before |
| 1144 | consulting the kill ring. If that value is a function and calling it | 1144 | consulting the kill ring. If that value is a function and calling it |
| 1145 | returns a string or a list of several string, @code{current-kill} | 1145 | returns a string or a list of several strings, @code{current-kill} |
| 1146 | pushes the strings onto the kill ring and returns the first string. | 1146 | pushes the strings onto the kill ring and returns the first string. |
| 1147 | It also sets the yanking pointer to point to the kill-ring entry of | 1147 | It also sets the yanking pointer to point to the kill-ring entry of |
| 1148 | the first string returned by @code{interprogram-paste-function}, | 1148 | the first string returned by @code{interprogram-paste-function}, |
| @@ -1155,8 +1155,10 @@ move the yanking pointer. | |||
| 1155 | @defun kill-new string &optional replace | 1155 | @defun kill-new string &optional replace |
| 1156 | This function pushes the text @var{string} onto the kill ring and | 1156 | This function pushes the text @var{string} onto the kill ring and |
| 1157 | makes the yanking pointer point to it. It discards the oldest entry | 1157 | makes the yanking pointer point to it. It discards the oldest entry |
| 1158 | if appropriate. It also invokes the value of | 1158 | if appropriate. It also invokes the values of |
| 1159 | @code{interprogram-cut-function} (see below). | 1159 | @code{interprogram-paste-function} (subject to |
| 1160 | the user option @code{save-interprogram-paste-before-kill}) | ||
| 1161 | and @code{interprogram-cut-function} (see below). | ||
| 1160 | 1162 | ||
| 1161 | If @var{replace} is non-@code{nil}, then @code{kill-new} replaces the | 1163 | If @var{replace} is non-@code{nil}, then @code{kill-new} replaces the |
| 1162 | first element of the kill ring with @var{string}, rather than pushing | 1164 | first element of the kill ring with @var{string}, rather than pushing |
| @@ -1168,8 +1170,10 @@ This function appends the text @var{string} to the first entry in the | |||
| 1168 | kill ring and makes the yanking pointer point to the combined entry. | 1170 | kill ring and makes the yanking pointer point to the combined entry. |
| 1169 | Normally @var{string} goes at the end of the entry, but if | 1171 | Normally @var{string} goes at the end of the entry, but if |
| 1170 | @var{before-p} is non-@code{nil}, it goes at the beginning. This | 1172 | @var{before-p} is non-@code{nil}, it goes at the beginning. This |
| 1171 | function also invokes the value of @code{interprogram-cut-function} | 1173 | function calls @code{kill-new} as a subroutine, thus causing the |
| 1172 | (see below). | 1174 | values of @code{interprogram-cut-function} and possibly |
| 1175 | @code{interprogram-paste-function} (see below) to be invoked by | ||
| 1176 | extension. | ||
| 1173 | @end defun | 1177 | @end defun |
| 1174 | 1178 | ||
| 1175 | @defvar interprogram-paste-function | 1179 | @defvar interprogram-paste-function |