summaryrefslogtreecommitdiff
path: root/lisp/simple.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-09-28 07:54:24 -0700
committerGlenn Morris <rgm@gnu.org>2018-09-28 07:54:24 -0700
commit6aa93b45af9fb3631fb8fb6a04407db4d9a74107 (patch)
tree9446e698538c3cccc3a7ac40f61e63fa028d68eb /lisp/simple.el
parent2d54710c36c8b5f7e0d25eefd45c318c0cb533ea (diff)
parent1908173a4d79649566fbef12962e251c69e300a2 (diff)
downloademacs-6aa93b45af9fb3631fb8fb6a04407db4d9a74107.tar.gz
Merge from origin/emacs-26
1908173 (origin/emacs-26) Fix Bug#32828 7f5086d * lisp/net/shr.el (shr-copy-url): Fix docstring. d309994 Fix typos in documentation 25cdd65 ; Spellcheck two more documentation strings c8bda05 ; * lisp/simple.el (save-interprogram-paste-before-kill): Fix... dc7fdee * doc/emacs/kmacro.texi (Basic Keyboard Macro): Mention old b... 17766a1 Improve docs of functions/variables related to 'display-buffer' a363931 * lisp/mouse.el (tear-off-window): Fix non-mouse use (bug#32799) 8b8a4c0 Improve documentation of directory-local variables c9c9756 Don't use obsolete variable 'save-place' in documentation ca208e8 Use save-place-mode instead of save-place
Diffstat (limited to 'lisp/simple.el')
-rw-r--r--lisp/simple.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index f0fcbf57562..e41630d4ed1 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4352,7 +4352,7 @@ ring directly.")
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]]."
+retrieved via \\[yank] \\[yank-pop]."
:type 'boolean
:group 'killing
:version "23.2")