diff options
| author | Glenn Morris | 2014-01-30 23:28:17 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-01-30 23:28:17 -0800 |
| commit | a69ecd19fe9ea522f7266b6852e2d6d080a192c2 (patch) | |
| tree | 20280e41ec19993fdbe6fd50b1881ba29d0f71a2 | |
| parent | 9997d7e3e3530043d3b924a11fad658b88016d87 (diff) | |
| download | emacs-a69ecd19fe9ea522f7266b6852e2d6d080a192c2.tar.gz emacs-a69ecd19fe9ea522f7266b6852e2d6d080a192c2.zip | |
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.
| -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 cdd255049c2..e9812652f70 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-01-31 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * efaq.texi (Replacing highlighted text): | ||
| 4 | Update delete-selection-mode doc. | ||
| 5 | |||
| 1 | 2014-01-30 Xue Fuqiao <xfq.free@gmail.com> | 6 | 2014-01-30 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 7 | ||
| 3 | * sem-user.texi (Include paths): Fix a Texinfo command. | 8 | * sem-user.texi (Include paths): Fix a Texinfo command. |
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index e840cc26b80..a13d3df43f1 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} | |||
| 1578 | delete-selection-mode @key{RET}}): | 1578 | delete-selection-mode @key{RET}}): |
| 1579 | 1579 | ||
| 1580 | @quotation | 1580 | @quotation |
| 1581 | When Delete Selection mode is enabled, Transient Mark mode is also | 1581 | When Delete Selection mode is enabled, typed text replaces the selection |
| 1582 | enabled and typed text replaces the selection if the selection is | 1582 | if the selection is active. Otherwise, typed text is just inserted at |
| 1583 | active. Otherwise, typed text is just inserted at point regardless of | 1583 | point regardless of any selection. |
| 1584 | any selection. | ||
| 1585 | @end quotation | 1584 | @end quotation |
| 1586 | 1585 | ||
| 1587 | This mode also allows you to delete (not kill) the highlighted region by | 1586 | 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. | |||
| 448 | There is a fallback syntax available if you don't have cf-promises or | 448 | There is a fallback syntax available if you don't have cf-promises or |
| 449 | if your version doesn't support that option. See option `cfengine-cf-promises'. | 449 | if your version doesn't support that option. See option `cfengine-cf-promises'. |
| 450 | 450 | ||
| 451 | ** Delete Selection mode can now be used without `transient-mark-mode'. | 451 | --- |
| 452 | ** Delete Selection mode can now be used without Transient Mark mode. | ||
| 452 | 453 | ||
| 453 | ** Desktop | 454 | ** Desktop |
| 454 | 455 | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5bbe6a027fd..f032b06a7f7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-01-31 Glenn Morris <rgm@gnu.org> | 1 | 2014-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 | |||
| 64 | is positive, and disable it otherwise. If called from Lisp, | 64 | is positive, and disable it otherwise. If called from Lisp, |
| 65 | enable the mode if ARG is omitted or nil. | 65 | enable the mode if ARG is omitted or nil. |
| 66 | 66 | ||
| 67 | When Delete Selection mode is enabled, Transient Mark mode is also | 67 | When Delete Selection mode is enabled, typed text replaces the selection |
| 68 | enabled and typed text replaces the selection if the selection is | 68 | if the selection is active. Otherwise, typed text is just inserted at |
| 69 | active. Otherwise, typed text is just inserted at point regardless of | 69 | point regardless of any selection." |
| 70 | any 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) |