aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/delsel.el7
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bbe6a027fd..f032b06a7f7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12014-01-31 Glenn Morris <rgm@gnu.org> 12014-01-31 Glenn Morris <rgm@gnu.org>
2 2
3 * delsel.el (delete-selection-mode): Doc fix.
4
3 * emacs-lisp/trace.el (trace--read-args, trace-function-foreground) 5 * emacs-lisp/trace.el (trace--read-args, trace-function-foreground)
4 (trace-function-background): Doc fixes. 6 (trace-function-background): Doc fixes.
5 7
diff --git a/lisp/delsel.el b/lisp/delsel.el
index fdf00236235..5c3d638f16c 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -64,10 +64,9 @@ With a prefix argument ARG, enable Delete Selection mode if ARG
64is positive, and disable it otherwise. If called from Lisp, 64is positive, and disable it otherwise. If called from Lisp,
65enable the mode if ARG is omitted or nil. 65enable the mode if ARG is omitted or nil.
66 66
67When Delete Selection mode is enabled, Transient Mark mode is also 67When Delete Selection mode is enabled, typed text replaces the selection
68enabled and typed text replaces the selection if the selection is 68if the selection is active. Otherwise, typed text is just inserted at
69active. Otherwise, typed text is just inserted at point regardless of 69point regardless of any selection."
70any selection."
71 :global t :group 'editing-basics 70 :global t :group 'editing-basics
72 (if (not delete-selection-mode) 71 (if (not delete-selection-mode)
73 (remove-hook 'pre-command-hook 'delete-selection-pre-hook) 72 (remove-hook 'pre-command-hook 'delete-selection-pre-hook)