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
<petterih@iki.fi> in emacs-manual-bugs@gnu.org.

* lisp/delsel.el (delete-selection-mode): Doc fix.

diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 5165881739f7b5035cf1c71c3c1b39b7ce8c1c97..6de0a142cfa6dcff11f7cb71a5b0a60eca439aae 100644 (file)
--- 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 eb935706001fae6ad2aa60eb91835a155ec1cbf6..80323bf0498c1b76f84a6922aa96b8bbb3d9a13c 100644 (file)
--- 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 65b2cb85cea16185a2aab14fc6b346368cfe6216..3e02d9502749b5d1a06f68aa28eeae56a4b52ca4 100644 (file)
--- 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."