aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii2015-11-28 20:38:27 +0200
committerEli Zaretskii2015-11-28 20:38:27 +0200
commit70d68a9dd155b36dfcc3112e699fe5b855c29425 (patch)
treee133b92220c791daf9eebf14534c208ae0229db7 /doc
parent63f7e4b4b95f8c347144596efcb9b5d806724c8d (diff)
downloademacs-70d68a9dd155b36dfcc3112e699fe5b855c29425.tar.gz
emacs-70d68a9dd155b36dfcc3112e699fe5b855c29425.zip
Document renaming of x-select-enable-* variables
* doc/emacs/killing.texi (Clipboard): Rename x-select-enable-clipboard to select-enable-clipboard and x-select-enable-primary to select-enable-primary. Update index entries. * etc/NEWS: Mark entry as documented.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/killing.texi10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index d453647b0c5..f05b8cc5445 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -504,9 +504,9 @@ does not alter the clipboard. However, if you change
504@code{yank-pop-change-selection} to @code{t}, then @kbd{M-y} saves the 504@code{yank-pop-change-selection} to @code{t}, then @kbd{M-y} saves the
505new yank to the clipboard. 505new yank to the clipboard.
506 506
507@vindex x-select-enable-clipboard 507@vindex select-enable-clipboard
508 To prevent kill and yank commands from accessing the clipboard, 508 To prevent kill and yank commands from accessing the clipboard,
509change the variable @code{x-select-enable-clipboard} to @code{nil}. 509change the variable @code{select-enable-clipboard} to @code{nil}.
510 510
511@cindex clipboard manager 511@cindex clipboard manager
512@vindex x-select-enable-clipboard-manager 512@vindex x-select-enable-clipboard-manager
@@ -519,14 +519,14 @@ when exiting Emacs; if you wish to prevent Emacs from transferring
519data to the clipboard manager, change the variable 519data to the clipboard manager, change the variable
520@code{x-select-enable-clipboard-manager} to @code{nil}. 520@code{x-select-enable-clipboard-manager} to @code{nil}.
521 521
522@vindex x-select-enable-primary 522@vindex select-enable-primary
523@findex clipboard-kill-region 523@findex clipboard-kill-region
524@findex clipboard-kill-ring-save 524@findex clipboard-kill-ring-save
525@findex clipboard-yank 525@findex clipboard-yank
526 Prior to Emacs 24, the kill and yank commands used the primary 526 Prior to Emacs 24, the kill and yank commands used the primary
527selection (@pxref{Primary Selection}), not the clipboard. If you 527selection (@pxref{Primary Selection}), not the clipboard. If you
528prefer this behavior, change @code{x-select-enable-clipboard} to 528prefer this behavior, change @code{select-enable-clipboard} to
529@code{nil}, @code{x-select-enable-primary} to @code{t}, and 529@code{nil}, @code{select-enable-primary} to @code{t}, and
530@code{mouse-drag-copy-region} to @code{t}. In this case, you can use 530@code{mouse-drag-copy-region} to @code{t}. In this case, you can use
531the following commands to act explicitly on the clipboard: 531the following commands to act explicitly on the clipboard:
532@code{clipboard-kill-region} kills the region and saves it to the 532@code{clipboard-kill-region} kills the region and saves it to the