diff options
| author | Eli Zaretskii | 2021-06-13 15:47:31 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2021-06-13 15:47:31 +0300 |
| commit | 788e5cce4d13db2f8cd942560e810e1fee1fea0d (patch) | |
| tree | 4c06cf73ae210c9ff55374e3a25c9325c1d4cbe8 | |
| parent | c4fcf2fc6fbdddb1da2ec1166bf95bfb72baff1a (diff) | |
| download | emacs-788e5cce4d13db2f8cd942560e810e1fee1fea0d.tar.gz emacs-788e5cce4d13db2f8cd942560e810e1fee1fea0d.zip | |
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)
| -rw-r--r-- | etc/NEWS | 6 | ||||
| -rw-r--r-- | lisp/simple.el | 20 |
2 files changed, 14 insertions, 12 deletions
| @@ -2089,8 +2089,10 @@ Shift while typing 'C-a', i.e. 'C-S-a', will now highlight the text. | |||
| 2089 | 2089 | ||
| 2090 | +++ | 2090 | +++ |
| 2091 | *** 'save-interprogram-paste-before-kill' can now be a number. | 2091 | *** 'save-interprogram-paste-before-kill' can now be a number. |
| 2092 | In that case, it's interpreted as a limit to how long the clipboard | 2092 | In that case, it's interpreted as a limit on the size of the clipboard |
| 2093 | data can be before saving to the kill ring. | 2093 | data that will be saved to the 'kill-ring' prior to killing text: if |
| 2094 | the size of the clipboard data is greater than or equal to the limit, | ||
| 2095 | it will not be saved. | ||
| 2094 | 2096 | ||
| 2095 | --- | 2097 | --- |
| 2096 | *** New variable 'hl-line-overlay-priority'. | 2098 | *** 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.") | |||
| 5037 | "The tail of the kill ring whose car is the last thing yanked.") | 5037 | "The tail of the kill ring whose car is the last thing yanked.") |
| 5038 | 5038 | ||
| 5039 | (defcustom save-interprogram-paste-before-kill nil | 5039 | (defcustom save-interprogram-paste-before-kill nil |
| 5040 | "Save existing clipboard text into kill ring before replacing it. | 5040 | "Whether to save existing clipboard text into kill ring before replacing it. |
| 5041 | A non-nil value ensures that Emacs kill operations do not | 5041 | A non-nil value means the clipboard text is saved to the `kill-ring' |
| 5042 | irrevocably overwrite existing clipboard text by saving it to the | 5042 | prior to any kill command. Such text can subsequently be retrieved |
| 5043 | `kill-ring' prior to the kill. Such text can subsequently be | 5043 | via \\[yank] \\[yank-pop]. This ensures that Emacs kill operations |
| 5044 | retrieved via \\[yank] \\[yank-pop]. | 5044 | do not irrevocably overwrite existing clipboard text. |
| 5045 | 5045 | ||
| 5046 | This variable can be either a number (in which case the clipboard | 5046 | The value of this variable can also be a number, in which case the |
| 5047 | data is only saved if it's shorter (in characters) than that | 5047 | clipboard data is only saved to the `kill-ring' if it's shorter |
| 5048 | number. Any other non-nil value will save the clipboard data | 5048 | (in characters) than that number. Any other non-nil value will save |
| 5049 | unconditionally." | 5049 | the clipboard data unconditionally." |
| 5050 | :type '(choice (const :tag "Always" t) | 5050 | :type '(choice (const :tag "Always" t) |
| 5051 | number) | 5051 | number) |
| 5052 | :group 'killing | 5052 | :group 'killing |