[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/doc/lispref/text.texi,v
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/doc/lispref/text.texi,v |
Date: |
Wed, 15 Oct 2008 14:43:24 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 08/10/15 14:43:23
Index: text.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/lispref/text.texi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- text.texi 1 Jul 2008 09:39:28 -0000 1.8
+++ text.texi 15 Oct 2008 14:43:23 -0000 1.9
@@ -1054,12 +1054,13 @@
@code{current-kill} calls the value of
@code{interprogram-paste-function} (documented below) before
consulting the kill ring. If that value is a function and calling it
-returns a string, @code{current-kill} pushes that string onto the kill
-ring and returns it. It also sets the yanking pointer to point to
-that new entry, regardless of the value of @var{do-not-move}.
-Otherwise, @code{current-kill} does not treat a zero value for @var{n}
-specially: it returns the entry pointed at by the yanking pointer and
-does not move the yanking pointer.
+returns a string or a list of several string, @code{current-kill}
+pushes the strings onto the kill ring and returns the first string.
+It also sets the yanking pointer to point to that new entry,
+regardless of the value of @var{do-not-move}. Otherwise,
address@hidden does not treat a zero value for @var{n} specially:
+it returns the entry pointed at by the yanking pointer and does not
+move the yanking pointer.
@end defun
@defun kill-new string &optional replace yank-handler
@@ -1102,9 +1103,19 @@
then that value is used as the ``most recent kill.'' If it returns
@code{nil}, then the front of the kill ring is used.
-The normal use of this hook is to get the window system's primary
+To facilitate support for window systems that support multiple
+selections, this function may also return a list of strings. In that
+case, the first string is used as the ``most recent kill'', and all
+the other strings are pushed onto the kill ring, for easy access by
address@hidden
+
+The normal use of this function is to get the window system's primary
selection as the most recent kill, even if the selection belongs to
-another application. @xref{Window System Selections}.
+another application. @xref{Window System Selections}. However, if
+the selection was provided by the current Emacs session, this function
+should return @code{nil}. (If it is hard to tell whether Emacs or
+some other program provided the selection, it should be good enough to
+use @code{string=} to compare it with the last text Emacs provided.)
@end defvar
@defvar interprogram-cut-function
@@ -1118,7 +1129,7 @@
argument to @code{x-set-cut-buffer} (@pxref{Definition of
x-set-cut-buffer}) and only affects the second and later cut buffers.
-The normal use of this hook is to set the window system's primary
+The normal use of this function is to set the window system's primary
selection (and first cut buffer) from the newly killed text.
@xref{Window System Selections}.
@end defvar
- [Emacs-diffs] Changes to emacs/doc/lispref/text.texi,v,
Eli Zaretskii <=