Mercurial > emacs
annotate lisp/delsel.el @ 43655:1ae60187a39d
fixed parens in the last patch
author | Sam Steingold <sds@gnu.org> |
---|---|
date | Sun, 03 Mar 2002 16:09:28 +0000 |
parents | 2538b11fc837 |
children | b03765d292c2 d7ddb3e565de |
rev | line source |
---|---|
2903
fa41174db2fa
Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents:
2233
diff
changeset
|
1 ;;; delsel.el --- delete selection if you insert |
2233
fb0ed5a1d0f3
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2074
diff
changeset
|
2 |
38616
3dbecf5d82d8
(delete-selection-pre-hook): Don't set this-command
Gerd Moellmann <gerd@gnu.org>
parents:
33185
diff
changeset
|
3 ;; Copyright (C) 1992, 1997, 1998, 2001 Free Software Foundation, Inc. |
2233
fb0ed5a1d0f3
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2074
diff
changeset
|
4 |
fb0ed5a1d0f3
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2074
diff
changeset
|
5 ;; Author: Matthieu Devin <devin@lucid.com> |
17976 | 6 ;; Maintainer: FSF |
2233
fb0ed5a1d0f3
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2074
diff
changeset
|
7 ;; Created: 14 Jul 92 |
29156 | 8 ;; Keywords: convenience emulations |
2073 | 9 |
14169 | 10 ;; This file is part of GNU Emacs. |
2073 | 11 |
14169 | 12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
13 ;; it under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 2, or (at your option) | |
15 ;; any later version. | |
2073 | 16 |
14169 | 17 ;; GNU Emacs is distributed in the hope that it will be useful, |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
2073 | 21 |
14169 | 22 ;; You should have received a copy of the GNU General Public License |
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
25 ;; Boston, MA 02111-1307, USA. | |
2073 | 26 |
2233
fb0ed5a1d0f3
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2074
diff
changeset
|
27 ;;; Commentary: |
2073 | 28 |
14169 | 29 ;; This file makes the active region be pending delete, meaning that |
30 ;; text inserted while the region is active will replace the region contents. | |
31 ;; This is a popular behavior of personal computers text editors. | |
2073 | 32 |
21720
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
33 ;; Interface: |
2233
fb0ed5a1d0f3
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2074
diff
changeset
|
34 |
21720
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
35 ;; Commands which will delete the selection need a 'delete-selection |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
36 ;; property on their symbols; commands which insert text but don't |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
37 ;; have this property won't delete the selction. It can be one of |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
38 ;; the values: |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
39 ;; 'yank |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
40 ;; For commands which do a yank; ensures the region about to be |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
41 ;; deleted isn't yanked. |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
42 ;; 'supersede |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
43 ;; Delete the active region and ignore the current command, |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
44 ;; i.e. the command will just delete the region. |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
45 ;; 'kill |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
46 ;; `kill-region' is used on the selection, rather than |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
47 ;; `delete-region'. (Text selected with the mouse will typically |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
48 ;; be yankable anyhow.) |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
49 ;; non-nil |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
50 ;; The normal case: delete the active region prior to executing |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
51 ;; the command which will insert replacement text. |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
52 |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
53 ;;; Code: |
18785
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
54 |
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
55 ;;;###autoload |
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
56 (defalias 'pending-delete-mode 'delete-selection-mode) |
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
57 |
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
58 ;;;###autoload |
32043
63a2ec6dae39
(delete-selection-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30817
diff
changeset
|
59 (define-minor-mode delete-selection-mode |
18785
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
60 "Toggle Delete Selection mode. |
21720
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
61 With prefix ARG, turn Delete Selection mode on if and only if ARG is |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
62 positive. |
18785
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
63 |
21720
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
64 When Delete Selection mode is enabled, Transient Mark mode is also |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
65 enabled and typed text replaces the selection if the selection is |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
66 active. Otherwise, typed text is just inserted at point regardless of |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
67 any selection." |
33185
7630435cbccd
(delete-selection-mode): Drop unneeded positional args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32043
diff
changeset
|
68 :global t :group 'editing-basics |
18785
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
69 (if (not delete-selection-mode) |
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
70 (remove-hook 'pre-command-hook 'delete-selection-pre-hook) |
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
71 (add-hook 'pre-command-hook 'delete-selection-pre-hook) |
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
72 (transient-mark-mode t))) |
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
73 |
2073 | 74 (defun delete-active-region (&optional killp) |
2074 | 75 (if killp |
76 (kill-region (point) (mark)) | |
77 (delete-region (point) (mark))) | |
78 (setq mark-active nil) | |
79 (run-hooks 'deactivate-mark-hook) | |
80 t) | |
2073 | 81 |
2903
fa41174db2fa
Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents:
2233
diff
changeset
|
82 (defun delete-selection-pre-hook () |
18785
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
83 (when (and delete-selection-mode transient-mark-mode mark-active |
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
84 (not buffer-read-only)) |
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
85 (let ((type (and (symbolp this-command) |
1a455d8dfa7c
Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents:
18641
diff
changeset
|
86 (get this-command 'delete-selection)))) |
41254
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
87 (condition-case data |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
88 (cond ((eq type 'kill) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
89 (delete-active-region t)) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
90 ((eq type 'yank) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
91 ;; Before a yank command, |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
92 ;; make sure we don't yank the same region |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
93 ;; that we are going to delete. |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
94 ;; That would make yank a no-op. |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
95 (when (string= (buffer-substring-no-properties (point) (mark)) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
96 (car kill-ring)) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
97 (current-kill 1)) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
98 (delete-active-region)) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
99 ((eq type 'supersede) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
100 (let ((empty-region (= (point) (mark)))) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
101 (delete-active-region) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
102 (unless empty-region |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
103 (setq this-command 'ignore)))) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
104 (type |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
105 (delete-active-region))) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
106 (file-supersession |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
107 ;; If ask-user-about-supersession-threat signals an error, |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
108 ;; stop safe_run_hooks from clearing out pre-command-hook. |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
109 (and (eq inhibit-quit 'pre-command-hook) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
110 (setq inhibit-quit 'delete-selection-dummy)) |
2538b11fc837
(delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents:
38616
diff
changeset
|
111 (signal 'file-supersession (cdr data))))))) |
2073 | 112 |
2903
fa41174db2fa
Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents:
2233
diff
changeset
|
113 (put 'self-insert-command 'delete-selection t) |
9533
b589ba0d8960
(self-insert-iso): Add delete-selection property.
Richard M. Stallman <rms@gnu.org>
parents:
2925
diff
changeset
|
114 (put 'self-insert-iso 'delete-selection t) |
2073 | 115 |
12790
afe7f3c735a3
(delete-selection-pre-hook): New type value `yank'.
Richard M. Stallman <rms@gnu.org>
parents:
11589
diff
changeset
|
116 (put 'yank 'delete-selection 'yank) |
13077
65092cab3f43
(clipboard-yank): Add delete-selection property.
Richard M. Stallman <rms@gnu.org>
parents:
12790
diff
changeset
|
117 (put 'clipboard-yank 'delete-selection 'yank) |
2925 | 118 (put 'insert-register 'delete-selection t) |
2073 | 119 |
2903
fa41174db2fa
Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents:
2233
diff
changeset
|
120 (put 'delete-backward-char 'delete-selection 'supersede) |
fa41174db2fa
Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents:
2233
diff
changeset
|
121 (put 'backward-delete-char-untabify 'delete-selection 'supersede) |
fa41174db2fa
Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents:
2233
diff
changeset
|
122 (put 'delete-char 'delete-selection 'supersede) |
2073 | 123 |
21720
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
124 (put 'newline-and-indent 'delete-selection t) |
2903
fa41174db2fa
Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents:
2233
diff
changeset
|
125 (put 'newline 'delete-selection t) |
21720
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
126 (put 'open-line 'delete-selection 'kill) |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
127 |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
128 (put 'insert-parentheses 'delete-selection t) |
2073 | 129 |
30817
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
130 ;; This is very useful for cancelling a selection in the minibuffer without |
2073 | 131 ;; aborting the minibuffer. |
132 (defun minibuffer-keyboard-quit () | |
133 "Abort recursive edit. | |
21720
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
134 In Delete Selection mode, if the mark is active, just deactivate it; |
b1ee274d921b
Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents:
19488
diff
changeset
|
135 then it takes a second \\[keyboard-quit] to abort the minibuffer." |
2073 | 136 (interactive) |
2925 | 137 (if (and delete-selection-mode transient-mark-mode mark-active) |
138 (setq deactivate-mark t) | |
2073 | 139 (abort-recursive-edit))) |
140 | |
30817
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
141 (define-key minibuffer-local-map "\C-g" 'minibuffer-keyboard-quit) |
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
142 (define-key minibuffer-local-ns-map "\C-g" 'minibuffer-keyboard-quit) |
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
143 (define-key minibuffer-local-completion-map "\C-g" 'minibuffer-keyboard-quit) |
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
144 (define-key minibuffer-local-must-match-map "\C-g" 'minibuffer-keyboard-quit) |
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
145 (define-key minibuffer-local-isearch-map "\C-g" 'minibuffer-keyboard-quit) |
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
146 |
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
147 (defun delsel-unload-hook () |
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
148 (define-key minibuffer-local-map "\C-g" 'abort-recursive-edit) |
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
149 (define-key minibuffer-local-ns-map "\C-g" 'abort-recursive-edit) |
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
150 (define-key minibuffer-local-completion-map "\C-g" 'abort-recursive-edit) |
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
151 (define-key minibuffer-local-must-match-map "\C-g" 'abort-recursive-edit) |
fd8b296712e7
(delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
29156
diff
changeset
|
152 (define-key minibuffer-local-isearch-map "\C-g" 'abort-recursive-edit)) |
2073 | 153 |
2925 | 154 (provide 'delsel) |
2073 | 155 |
2925 | 156 ;;; delsel.el ends here |