diff options
| author | Juri Linkov | 2005-08-14 06:59:39 +0000 |
|---|---|---|
| committer | Juri Linkov | 2005-08-14 06:59:39 +0000 |
| commit | ec08e2f4da08c2d53ba10442ba3a9b58ba914d8c (patch) | |
| tree | c6c2ca27174e687bed7e600ee3943370c9c43fbd | |
| parent | 05d9618303a619a5f6c91ff2697063e93dbc91c9 (diff) | |
| download | emacs-ec08e2f4da08c2d53ba10442ba3a9b58ba914d8c.tar.gz emacs-ec08e2f4da08c2d53ba10442ba3a9b58ba914d8c.zip | |
(delete-selection-pre-hook): If overwrite-mode is
enabled and the current command is self-insert-command, call it
explicitly with overwrite-mode bound to nil, to not allow it
to delete the character after the selected region.
| -rw-r--r-- | lisp/ChangeLog | 22 | ||||
| -rw-r--r-- | lisp/delsel.el | 6 |
2 files changed, 25 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b0c9a6c1297..3936dc45eb9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,22 @@ | |||
| 1 | 2005-08-14 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * progmodes/compile.el (compilation-mode-font-lock-keywords): | ||
| 4 | Remove highlighting of "Compilation started". Highlight only | ||
| 5 | the word "finished" in "Compilation finished". Add highlighting | ||
| 6 | of "interrupt", "killed", "terminated" and the exit code. | ||
| 7 | (compilation-start): Add newline after header. Use exactly the | ||
| 8 | same time stamp format as the finishing message. | ||
| 9 | (compilation-mode-map): Add ellipsis to "Search Files (grep)". | ||
| 10 | |||
| 11 | * progmodes/grep.el (grep-mode-map): Add ellipsis to "Another grep". | ||
| 12 | (grep-mode-font-lock-keywords): Don't highlight "Grep started". | ||
| 13 | Add highlighting of "interrupt", "killed", "terminated". | ||
| 14 | |||
| 15 | * delsel.el (delete-selection-pre-hook): If overwrite-mode is | ||
| 16 | enabled and the current command is self-insert-command, call it | ||
| 17 | explicitly with overwrite-mode bound to nil, to not allow it | ||
| 18 | to delete the character after the selected region. | ||
| 19 | |||
| 1 | 2005-08-12 Matt Hodges <MPHodges@member.fsf.org> | 20 | 2005-08-12 Matt Hodges <MPHodges@member.fsf.org> |
| 2 | 21 | ||
| 3 | * emacs-lisp/eldoc.el: Add move-beginning-of-line, | 22 | * emacs-lisp/eldoc.el: Add move-beginning-of-line, |
| @@ -252,8 +271,7 @@ | |||
| 252 | 271 | ||
| 253 | 2005-08-09 Juri Linkov <juri@jurta.org> | 272 | 2005-08-09 Juri Linkov <juri@jurta.org> |
| 254 | 273 | ||
| 255 | * info.el: Replace `info' with upper-case `Info' | 274 | * info.el: Replace `info' with upper-case `Info' where appropriate. |
| 256 | where appropriate. | ||
| 257 | (info-title-1, info-title-2, info-title-3, info-title-4) | 275 | (info-title-1, info-title-2, info-title-3, info-title-4) |
| 258 | (info-menu-header): Move up face definitions. | 276 | (info-menu-header): Move up face definitions. |
| 259 | (info-menu-star): Rename from `info-menu-5'. | 277 | (info-menu-star): Rename from `info-menu-5'. |
diff --git a/lisp/delsel.el b/lisp/delsel.el index 74ef011d477..d7a3d90e969 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el | |||
| @@ -101,7 +101,11 @@ any selection." | |||
| 101 | (unless empty-region | 101 | (unless empty-region |
| 102 | (setq this-command 'ignore)))) | 102 | (setq this-command 'ignore)))) |
| 103 | (type | 103 | (type |
| 104 | (delete-active-region))) | 104 | (delete-active-region) |
| 105 | (if (and overwrite-mode (eq this-command 'self-insert-command)) | ||
| 106 | (let ((overwrite-mode nil)) | ||
| 107 | (self-insert-command (prefix-numeric-value current-prefix-arg)) | ||
| 108 | (setq this-command 'ignore))))) | ||
| 105 | (file-supersession | 109 | (file-supersession |
| 106 | ;; If ask-user-about-supersession-threat signals an error, | 110 | ;; If ask-user-about-supersession-threat signals an error, |
| 107 | ;; stop safe_run_hooks from clearing out pre-command-hook. | 111 | ;; stop safe_run_hooks from clearing out pre-command-hook. |