From 788e5cce4d13db2f8cd942560e810e1fee1fea0d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 13 Jun 2021 15:47:31 +0300 Subject: [PATCH] Fix wording of recently added documentation * etc/NEWS: * lisp/simple.el (save-interprogram-paste-before-kill): Fix wording of a recently added documentation. (Bug#41168) --- etc/NEWS | 6 ++++-- lisp/simple.el | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index d3ee5659ac4..4fe95ddc262 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -2089,8 +2089,10 @@ Shift while typing 'C-a', i.e. 'C-S-a', will now highlight the text. +++ *** 'save-interprogram-paste-before-kill' can now be a number. -In that case, it's interpreted as a limit to how long the clipboard -data can be before saving to the kill ring. +In that case, it's interpreted as a limit on the size of the clipboard +data that will be saved to the 'kill-ring' prior to killing text: if +the size of the clipboard data is greater than or equal to the limit, +it will not be saved. --- *** New variable 'hl-line-overlay-priority'. diff --git a/lisp/simple.el b/lisp/simple.el index dfe2549afc8..4630a11c753 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -5037,16 +5037,16 @@ ring directly.") "The tail of the kill ring whose car is the last thing yanked.") (defcustom save-interprogram-paste-before-kill nil - "Save existing clipboard text into kill ring before replacing it. -A non-nil value ensures that Emacs kill operations do not -irrevocably overwrite existing clipboard text by saving it to the -`kill-ring' prior to the kill. Such text can subsequently be -retrieved via \\[yank] \\[yank-pop]. - -This variable can be either a number (in which case the clipboard -data is only saved if it's shorter (in characters) than that -number. Any other non-nil value will save the clipboard data -unconditionally." + "Whether to save existing clipboard text into kill ring before replacing it. +A non-nil value means the clipboard text is saved to the `kill-ring' +prior to any kill command. Such text can subsequently be retrieved +via \\[yank] \\[yank-pop]. This ensures that Emacs kill operations +do not irrevocably overwrite existing clipboard text. + +The value of this variable can also be a number, in which case the +clipboard data is only saved to the `kill-ring' if it's shorter +(in characters) than that number. Any other non-nil value will save +the clipboard data unconditionally." :type '(choice (const :tag "Always" t) number) :group 'killing -- 2.39.5