aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/killing.texi14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index cc349a6a02a..2fd2d21dd35 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -540,11 +540,11 @@ clipboard.
540clipboard contents are normally lost. Optionally, Emacs can save the 540clipboard contents are normally lost. Optionally, Emacs can save the
541existing clipboard contents to the kill ring, preventing you from 541existing clipboard contents to the kill ring, preventing you from
542losing the old clipboard data. If 542losing the old clipboard data. If
543@code{save-interprogram-paste-before-kill} changed to a number, then 543@code{save-interprogram-paste-before-kill} has been set to a number,
544this data is copied over if it's smaller (in characters) than this 544then the data is copied over if it's smaller (in characters) than
545number. If this variable is any other non-@code{nil} value, it's 545this number. If this variable is any other non-@code{nil} value, the
546always copied over---at the risk of high memory consumption if that 546data is always copied over---at the risk of high memory consumption if
547data turns out to be large. 547that data turns out to be large.
548 548
549 Yank commands, such as @kbd{C-y} (@code{yank}), also use the 549 Yank commands, such as @kbd{C-y} (@code{yank}), also use the
550clipboard. If another application ``owns'' the clipboard---i.e., if 550clipboard. If another application ``owns'' the clipboard---i.e., if
@@ -567,8 +567,8 @@ change the variable @code{select-enable-clipboard} to @code{nil}.
567instance, a web browser will usually let you choose ``Copy Image'' on 567instance, a web browser will usually let you choose ``Copy Image'' on
568images, and this image will be put on the clipboard. On capable 568images, and this image will be put on the clipboard. On capable
569platforms, Emacs can yank these objects with the @code{yank-media} 569platforms, Emacs can yank these objects with the @code{yank-media}
570command---but only in modes that have support for it (@pxref{Yanking 570command---but only in modes that have support for it (@w{@pxref{Yanking
571Media,,, elisp, The Emacs Lisp Reference Manual}). 571Media,,, elisp, The Emacs Lisp Reference Manual}}).
572 572
573@cindex clipboard manager 573@cindex clipboard manager
574@vindex x-select-enable-clipboard-manager 574@vindex x-select-enable-clipboard-manager