From 5b38406491917887f67684aacacc73af74d736a9 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 27 Dec 2017 20:23:10 +0200 Subject: [PATCH] Fix documentation of delsel and of killing text * doc/emacs/killing.texi (Appending Kills): Make sure the text with 2 spaces is not broken between 2 lines. * doc/emacs/mark.texi (Using Region): Remove the sentence about delsel mode that describes behavior which exists even without delsel mode turned on. Suggested by Petteri Hintsanen in emacs-manual-bugs@gnu.org. * lisp/delsel.el (delete-selection-mode): Doc fix. --- doc/emacs/killing.texi | 8 ++++---- doc/emacs/mark.texi | 4 +--- lisp/delsel.el | 3 +-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 5165881739f..6de0a142cfa 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -415,10 +415,10 @@ This is a line @point{}of sample text. @noindent with point shown by @point{}. If you type @kbd{M-d M-@key{DEL} M-d M-@key{DEL}}, killing alternately forward and backward, you end up with -@samp{a line of sample} as one entry in the kill ring, and @samp{This -is@ @ text.} in the buffer. (Note the double space between @samp{is} -and @samp{text}, which you can clean up with @kbd{M-@key{SPC}} or -@kbd{M-q}.) +@samp{a line of sample} as one entry in the kill ring, and +@w{@samp{This is@ @ text.}} in the buffer. (Note the double space +between @samp{is} and @samp{text}, which you can clean up with +@kbd{M-@key{SPC}} or @kbd{M-q}.) Another way to kill the same text is to move back two words with @kbd{M-b M-b}, then kill all four words forward with @kbd{C-u M-d}. diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index eb935706001..80323bf0498 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -289,9 +289,7 @@ active---for example, typing @kbd{a} inserts the character @samp{a}, then deactivates the mark. Delete Selection mode, a minor mode, modifies this behavior: if you enable that mode, then inserting text while the mark is active causes the text in the region to be deleted -first. Also, commands that normally delete just one character, such -as @kbd{C-d} or @kbd{@key{DEL}}, will delete the entire region -instead. To toggle Delete Selection mode on or off, type @kbd{M-x +first. To toggle Delete Selection mode on or off, type @kbd{M-x delete-selection-mode}. @node Mark Ring diff --git a/lisp/delsel.el b/lisp/delsel.el index 65b2cb85cea..3e02d950274 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -79,8 +79,7 @@ a non-positive integer, and enable the mode otherwise When Delete Selection mode is enabled, typed text replaces the selection if the selection is active. Otherwise, typed text is just inserted at -point regardless of any selection. Also, commands that normally delete -just one character will delete the entire selection instead. +point regardless of any selection. See `delete-selection-helper' and `delete-selection-pre-hook' for information on adapting behavior of commands in Delete Selection mode." -- 2.11.4.GIT