diff options
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/efaq.texi | 7 | ||||
| -rw-r--r-- | etc/NEWS | 3 | ||||
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/delsel.el | 7 |
5 files changed, 15 insertions, 9 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index cdd255049c..e9812652f7 100644 --- 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 e840cc26b8..a13d3df43f 100644 --- 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 @@ -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 5bbe6a027f..f032b06a7f 100644 --- 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 fdf0023623..5c3d638f16 100644 --- 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) |