Delete Selection mode doc updates

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

* doc/misc/efaq.texi (Replacing highlighted text):
Update delete-selection-mode doc.

* etc/NEWS: Related edit.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index cdd255049c2252f584ef49e404a51edb83b9ea76..e9812652f700bd4b06b6ac6c24a5697f8dfb7062 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-31  Glenn Morris  <rgm@gnu.org>
+
+       * efaq.texi (Replacing highlighted text):
+       Update delete-selection-mode doc.
+
 2014-01-30  Xue Fuqiao  <xfq.free@gmail.com>
 
        * sem-user.texi (Include paths): Fix a Texinfo command.

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index e840cc26b80ed1c55669831a9cf8336de03bab30..a13d3df43f1020930bdbe4efd034f95e2d0794a8 100644 (file)
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -1578,10 +1578,9 @@ According to the documentation string for @code{delete-selection-mode}
 delete-selection-mode @key{RET}}):
 
 @quotation
-When Delete Selection mode is enabled, Transient Mark mode is also
-enabled and typed text replaces the selection if the selection is
-active.  Otherwise, typed text is just inserted at point regardless of
-any selection.
+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.
 @end quotation
 
 This mode also allows you to delete (not kill) the highlighted region by

diff --git a/etc/NEWS b/etc/NEWS
index aa0d3d8a691fc5257234922e361c8e470f0dfbec..c17eb3ec09a9f247a2ca4c69f7cf7e48adc580f4 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -448,7 +448,8 @@ You can disable `transient-mark-mode' to get the same result.
 There is a fallback syntax available if you don't have cf-promises or
 if your version doesn't support that option.  See option `cfengine-cf-promises'.
 
-** Delete Selection mode can now be used without `transient-mark-mode'.
+---
+** Delete Selection mode can now be used without Transient Mark mode.
 
 ** Desktop
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bbe6a027fd6565b5b6feb1ad0b620d1bbb69289..f032b06a7f7d7ea0e01700bb1eac9dcdae31f847 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-01-31  Glenn Morris  <rgm@gnu.org>
 
+       * delsel.el (delete-selection-mode): Doc fix.
+
        * emacs-lisp/trace.el (trace--read-args, trace-function-foreground)
        (trace-function-background): Doc fixes.
 

diff --git a/lisp/delsel.el b/lisp/delsel.el
index fdf002362354a692cb146d114c093f223dcbc9bf..5c3d638f16c75617ccab0bb89eeac4144f404683 100644 (file)
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -64,10 +64,9 @@ With a prefix argument ARG, enable Delete Selection mode if ARG
 is positive, and disable it otherwise.  If called from Lisp,
 enable the mode if ARG is omitted or nil.
 
-When Delete Selection mode is enabled, Transient Mark mode is also
-enabled and typed text replaces the selection if the selection is
-active.  Otherwise, typed text is just inserted at point regardless of
-any selection."
+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."
   :global t :group 'editing-basics
   (if (not delete-selection-mode)
       (remove-hook 'pre-command-hook 'delete-selection-pre-hook)