Mercurial > emacs
annotate lisp/emulation/viper-macs.el @ 96849:d049ef97c446
* print.c (print_object): Check print_depth before searching for
circularities.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 21 Jul 2008 05:02:31 +0000 |
parents | eb7b2376cae5 |
children | a9dc0e7c3f2b |
rev | line source |
---|---|
13337 | 1 ;;; viper-macs.el --- functions implementing keyboard macros for Viper |
2 | |
64701
34bd8e434dd7
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64215
diff
changeset
|
3 ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, |
79705 | 4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
11288 | 5 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
7 |
10789 | 8 ;; This file is part of GNU Emacs. |
9 | |
94658
eb7b2376cae5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
10 ;; GNU Emacs is free software: you can redistribute it and/or modify |
10789 | 11 ;; it under the terms of the GNU General Public License as published by |
94658
eb7b2376cae5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
12 ;; the Free Software Foundation, either version 3 of the License, or |
eb7b2376cae5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; (at your option) any later version. |
10789 | 14 |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
94658
eb7b2376cae5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
10789 | 22 |
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
26263
diff
changeset
|
23 ;;; Commentary: |
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
26263
diff
changeset
|
24 |
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
26263
diff
changeset
|
25 ;;; Code: |
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14587
diff
changeset
|
26 |
18047 | 27 (provide 'viper-macs) |
28 | |
29 ;; compiler pacifier | |
19079 | 30 (defvar viper-ex-work-buf) |
31 (defvar viper-custom-file-name) | |
32 (defvar viper-current-state) | |
33 (defvar viper-fast-keyseq-timeout) | |
18047 | 34 |
18172 | 35 ;; loading happens only in non-interactive compilation |
36 ;; in order to spare non-viperized emacs from being viperized | |
37 (if noninteractive | |
38 (eval-when-compile | |
93615
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
39 (require 'viper-cmd) |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
40 )) |
18047 | 41 ;; end pacifier |
42 | |
10789 | 43 (require 'viper-util) |
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14587
diff
changeset
|
44 (require 'viper-keym) |
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14587
diff
changeset
|
45 |
10789 | 46 |
47 ;;; Variables | |
48 | |
49 ;; Register holding last macro. | |
19079 | 50 (defvar viper-last-macro-reg nil) |
10789 | 51 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
52 ;; format of the elements of kbd alists: |
10789 | 53 ;; (name ((buf . macr)...(buf . macr)) ((maj-mode . macr)...) (t . macr)) |
54 ;; kbd macro alist for Vi state | |
19079 | 55 (defvar viper-vi-kbd-macro-alist nil) |
10789 | 56 ;; same for insert/replace state |
19079 | 57 (defvar viper-insert-kbd-macro-alist nil) |
10789 | 58 ;; same for emacs state |
19079 | 59 (defvar viper-emacs-kbd-macro-alist nil) |
10789 | 60 |
61 ;; Internal var that passes info between start-kbd-macro and end-kbd-macro | |
62 ;; in :map and :map! | |
19079 | 63 (defvar viper-kbd-macro-parameters nil) |
10789 | 64 |
19079 | 65 (defvar viper-this-kbd-macro nil |
10789 | 66 "Vector of keys representing the name of currently running Viper kbd macro.") |
19079 | 67 (defvar viper-last-kbd-macro nil |
10789 | 68 "Vector of keys representing the name of last Viper keyboard macro.") |
69 | |
19079 | 70 (defcustom viper-repeat-from-history-key 'f12 |
18839 | 71 "Prefix key for accessing previously typed Vi commands. |
10789 | 72 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
73 The previous command is accessible, as usual, via `.'. The command before this |
18839 | 74 can be invoked as `<this key> 1', and the command before that, and the command |
75 before that one is accessible as `<this key> 2'. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
76 The notation for these keys is borrowed from XEmacs. Basically, |
10789 | 77 a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g., |
18839 | 78 `(meta control f1)'." |
19907
819a01a83872
(viper-repeat-from-history-key): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19079
diff
changeset
|
79 :type 'sexp |
18839 | 80 :group 'viper) |
10789 | 81 |
82 | |
83 | |
84 ;;; Code | |
85 | |
12140
75379a19c5d5
Changed vip-*-frame-* to *-frame-*, incorporated overlay strings,
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
86 ;; Ex map command |
10789 | 87 (defun ex-map () |
88 (let ((mod-char "") | |
89 macro-name macro-body map-args ins) | |
90 (save-window-excursion | |
19079 | 91 (set-buffer viper-ex-work-buf) |
10789 | 92 (if (looking-at "!") |
93 (progn | |
94 (setq ins t | |
95 mod-char "!") | |
96 (forward-char 1)))) | |
97 (setq map-args (ex-map-read-args mod-char) | |
98 macro-name (car map-args) | |
99 macro-body (cdr map-args)) | |
19079 | 100 (setq viper-kbd-macro-parameters (list ins mod-char macro-name macro-body)) |
10789 | 101 (if macro-body |
19079 | 102 (viper-end-mapping-kbd-macro 'ignore) |
10789 | 103 (ex-fixup-history (format "map%s %S" mod-char |
19079 | 104 (viper-display-macro macro-name))) |
10789 | 105 ;; if defining macro for insert, switch there for authentic WYSIWYG |
19079 | 106 (if ins (viper-change-state-to-insert)) |
10789 | 107 (start-kbd-macro nil) |
19079 | 108 (define-key viper-vi-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro) |
109 (define-key viper-insert-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro) | |
110 (define-key viper-emacs-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro) | |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65589
diff
changeset
|
111 (message "Mapping %S in %s state. Type macro definition followed by `C-x )'" |
19079 | 112 (viper-display-macro macro-name) |
10789 | 113 (if ins "Insert" "Vi"))) |
114 )) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
115 |
10789 | 116 |
12140
75379a19c5d5
Changed vip-*-frame-* to *-frame-*, incorporated overlay strings,
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
117 ;; Ex unmap |
10789 | 118 (defun ex-unmap () |
119 (let ((mod-char "") | |
120 temp macro-name ins) | |
121 (save-window-excursion | |
19079 | 122 (set-buffer viper-ex-work-buf) |
10789 | 123 (if (looking-at "!") |
124 (progn | |
125 (setq ins t | |
126 mod-char "!") | |
127 (forward-char 1)))) | |
128 | |
129 (setq macro-name (ex-unmap-read-args mod-char)) | |
19079 | 130 (setq temp (viper-fixup-macro (vconcat macro-name))) ;; copy and fixup |
10789 | 131 (ex-fixup-history (format "unmap%s %S" mod-char |
19079 | 132 (viper-display-macro temp))) |
133 (viper-unrecord-kbd-macro macro-name (if ins 'insert-state 'vi-state)) | |
10789 | 134 )) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
135 |
10789 | 136 |
137 ;; read arguments for ex-map | |
138 (defun ex-map-read-args (variant) | |
139 (let ((cursor-in-echo-area t) | |
140 (key-seq []) | |
141 temp key event message | |
142 macro-name macro-body args) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
143 |
10789 | 144 (condition-case nil |
145 (setq args (concat (ex-get-inline-cmd-args ".*map[!]*[ \t]?" "\n\C-m") | |
146 " nil nil ") | |
147 temp (read-from-string args) | |
148 macro-name (car temp) | |
149 macro-body (car (read-from-string args (cdr temp)))) | |
150 (error | |
151 (signal | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
152 'error |
10789 | 153 '("map: Macro name and body must be a quoted string or a vector")))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
154 |
10789 | 155 ;; We expect macro-name to be a vector, a string, or a quoted string. |
156 ;; In the second case, it will emerge as a symbol when read from | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
157 ;; the above read-from-string. So we need to convert it into a string |
10789 | 158 (if macro-name |
159 (cond ((vectorp macro-name) nil) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
160 ((stringp macro-name) |
10789 | 161 (setq macro-name (vconcat macro-name))) |
162 (t (setq macro-name (vconcat (prin1-to-string macro-name))))) | |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65589
diff
changeset
|
163 (message ":map%s <Macro Name>" variant)(sit-for 2) |
10789 | 164 (while |
165 (not (member key | |
166 '(?\C-m ?\n (control m) (control j) return linefeed))) | |
167 (setq key-seq (vconcat key-seq (if key (vector key) []))) | |
168 ;; the only keys available for editing are these-- no help while there | |
169 (if (member | |
170 key | |
171 '(?\b ?\d '^? '^H (control h) (control \?) backspace delete)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
172 (setq key-seq (viper-subseq key-seq 0 (- (length key-seq) 2)))) |
10789 | 173 (setq message |
14585
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
174 (format |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
175 ":map%s %s" |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
176 variant (if (> (length key-seq) 0) |
19079 | 177 (prin1-to-string (viper-display-macro key-seq)) |
14585
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
178 ""))) |
65589
0670efd1e2df
message format spec fixes, commit # 8
Deepak Goel <deego@gnufans.org>
parents:
64701
diff
changeset
|
179 (message "%s" message) |
19079 | 180 (setq event (viper-read-key)) |
181 ;;(setq event (viper-read-event)) | |
10789 | 182 (setq key |
19079 | 183 (if (viper-mouse-event-p event) |
10789 | 184 (progn |
185 (message "%s (No mouse---only keyboard keys, please)" | |
186 message) | |
187 (sit-for 2) | |
188 nil) | |
19079 | 189 (viper-event-key event))) |
10789 | 190 ) |
191 (setq macro-name key-seq)) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
192 |
10789 | 193 (if (= (length macro-name) 0) |
194 (error "Can't map an empty macro name")) | |
19079 | 195 (setq macro-name (viper-fixup-macro macro-name)) |
196 (if (viper-char-array-p macro-name) | |
197 (setq macro-name (viper-char-array-to-macro macro-name))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
198 |
10789 | 199 (if macro-body |
19079 | 200 (cond ((viper-char-array-p macro-body) |
201 (setq macro-body (viper-char-array-to-macro macro-body))) | |
10789 | 202 ((vectorp macro-body) nil) |
203 (t (error "map: Invalid syntax in macro definition")))) | |
12140
75379a19c5d5
Changed vip-*-frame-* to *-frame-*, incorporated overlay strings,
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
204 (setq cursor-in-echo-area nil)(sit-for 0) ; this overcomes xemacs tty bug |
75379a19c5d5
Changed vip-*-frame-* to *-frame-*, incorporated overlay strings,
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
205 (cons macro-name macro-body))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
206 |
10789 | 207 |
208 | |
209 ;; read arguments for ex-unmap | |
210 (defun ex-unmap-read-args (variant) | |
211 (let ((cursor-in-echo-area t) | |
212 (macro-alist (if (string= variant "!") | |
19079 | 213 viper-insert-kbd-macro-alist |
214 viper-vi-kbd-macro-alist)) | |
10789 | 215 ;; these are disabled just in case, to avoid surprises when doing |
216 ;; completing-read | |
19079 | 217 viper-vi-kbd-minor-mode viper-insert-kbd-minor-mode |
218 viper-emacs-kbd-minor-mode | |
219 viper-vi-intercept-minor-mode viper-insert-intercept-minor-mode | |
220 viper-emacs-intercept-minor-mode | |
10789 | 221 event message |
222 key key-seq macro-name) | |
223 (setq macro-name (ex-get-inline-cmd-args ".*unma?p?[!]*[ \t]*")) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
224 |
10789 | 225 (if (> (length macro-name) 0) |
226 () | |
227 (message ":unmap%s <Name>" variant) (sit-for 2) | |
228 (while | |
229 (not | |
230 (member key '(?\C-m ?\n (control m) (control j) return linefeed))) | |
231 (setq key-seq (vconcat key-seq (if key (vector key) []))) | |
232 ;; the only keys available for editing are these-- no help while there | |
233 (cond ((member | |
234 key | |
235 '(?\b ?\d '^? '^H (control h) (control \?) backspace delete)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
236 (setq key-seq (viper-subseq key-seq 0 (- (length key-seq) 2)))) |
10789 | 237 ((member key '(tab (control i) ?\t)) |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
238 (setq key-seq (viper-subseq key-seq 0 (1- (length key-seq)))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
239 (setq message |
14585
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
240 (format |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
241 ":unmap%s %s" |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
242 variant (if (> (length key-seq) 0) |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
243 (prin1-to-string |
19079 | 244 (viper-display-macro key-seq)) |
14585
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
245 ""))) |
10789 | 246 (setq key-seq |
19079 | 247 (viper-do-sequence-completion key-seq macro-alist message)) |
10789 | 248 )) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
249 (setq message |
14585
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
250 (format |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
251 ":unmap%s %s" |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
252 variant (if (> (length key-seq) 0) |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
253 (prin1-to-string |
19079 | 254 (viper-display-macro key-seq)) |
14585
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
255 ""))) |
65589
0670efd1e2df
message format spec fixes, commit # 8
Deepak Goel <deego@gnufans.org>
parents:
64701
diff
changeset
|
256 (message "%s" message) |
19079 | 257 (setq event (viper-read-key)) |
258 ;;(setq event (viper-read-event)) | |
10789 | 259 (setq key |
19079 | 260 (if (viper-mouse-event-p event) |
10789 | 261 (progn |
262 (message "%s (No mouse---only keyboard keys, please)" | |
263 message) | |
264 (sit-for 2) | |
265 nil) | |
19079 | 266 (viper-event-key event))) |
10789 | 267 ) |
268 (setq macro-name key-seq)) | |
269 | |
270 (if (= (length macro-name) 0) | |
271 (error "Can't unmap an empty macro name")) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
272 |
10789 | 273 ;; convert macro names into vector, if starts with a `[' |
274 (if (memq (elt macro-name 0) '(?\[ ?\")) | |
275 (car (read-from-string macro-name)) | |
276 (vconcat macro-name)) | |
277 )) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
278 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
279 |
14585
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
280 ;; Terminate a Vi kbd macro. |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
281 ;; optional argument IGNORE, if t, indicates that we are dealing with an |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
282 ;; existing macro that needs to be registered, but there is no need to |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
283 ;; terminate a kbd macro. |
19079 | 284 (defun viper-end-mapping-kbd-macro (&optional ignore) |
10789 | 285 (interactive) |
19079 | 286 (define-key viper-vi-intercept-map "\C-x)" nil) |
287 (define-key viper-insert-intercept-map "\C-x)" nil) | |
288 (define-key viper-emacs-intercept-map "\C-x)" nil) | |
10789 | 289 (if (and (not ignore) |
19079 | 290 (or (not viper-kbd-macro-parameters) |
10789 | 291 (not defining-kbd-macro))) |
292 (error "Not mapping a kbd-macro")) | |
19079 | 293 (let ((mod-char (nth 1 viper-kbd-macro-parameters)) |
294 (ins (nth 0 viper-kbd-macro-parameters)) | |
295 (macro-name (nth 2 viper-kbd-macro-parameters)) | |
296 (macro-body (nth 3 viper-kbd-macro-parameters))) | |
297 (setq viper-kbd-macro-parameters nil) | |
10789 | 298 (or ignore |
299 (progn | |
300 (end-kbd-macro nil) | |
19079 | 301 (setq macro-body (viper-events-to-macro last-kbd-macro)) |
10789 | 302 ;; always go back to Vi, since this is where we started |
303 ;; defining macro | |
19079 | 304 (viper-change-state-to-vi))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
305 |
19079 | 306 (viper-record-kbd-macro macro-name |
10789 | 307 (if ins 'insert-state 'vi-state) |
19079 | 308 (viper-display-macro macro-body)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
309 |
10789 | 310 (ex-fixup-history (format "map%s %S %S" mod-char |
19079 | 311 (viper-display-macro macro-name) |
312 (viper-display-macro macro-body))) | |
10789 | 313 )) |
314 | |
315 | |
316 | |
317 | |
318 ;;; Recording, unrecording, executing | |
319 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
320 ;; Accepts as macro names: strings and vectors. |
10789 | 321 ;; strings must be strings of characters; vectors must be vectors of keys |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
322 ;; in canonic form. The canonic form is essentially the form used in XEmacs |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
323 ;; More general definitions are inherited by more specific scopes: |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
324 ;; global->major mode->buffer. More specific definitions override more general |
19079 | 325 (defun viper-record-kbd-macro (macro-name state macro-body &optional scope) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
326 "Record a Vi macro. Can be used in `.viper' file to define permanent macros. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
327 MACRO-NAME is a string of characters or a vector of keys. STATE is |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
328 either `vi-state' or `insert-state'. It specifies the Viper state in which to |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
329 define the macro. MACRO-BODY is a string that represents the keyboard macro. |
10789 | 330 Optional SCOPE says whether the macro should be global \(t\), mode-specific |
331 \(a major-mode symbol\), or buffer-specific \(buffer name, a string\). | |
332 If SCOPE is nil, the user is asked to specify the scope." | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
333 (let* (state-name keymap |
10789 | 334 (macro-alist-var |
335 (cond ((eq state 'vi-state) | |
336 (setq state-name "Vi state" | |
19079 | 337 keymap viper-vi-kbd-map) |
338 'viper-vi-kbd-macro-alist) | |
10789 | 339 ((memq state '(insert-state replace-state)) |
340 (setq state-name "Insert state" | |
19079 | 341 keymap viper-insert-kbd-map) |
342 'viper-insert-kbd-macro-alist) | |
10789 | 343 (t |
344 (setq state-name "Emacs state" | |
19079 | 345 keymap viper-emacs-kbd-map) |
346 'viper-emacs-kbd-macro-alist) | |
10789 | 347 )) |
348 new-elt old-elt old-sub-elt msg | |
349 temp lis lis2) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
350 |
10789 | 351 (if (= (length macro-name) 0) |
352 (error "Can't map an empty macro name")) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
353 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
354 ;; Macro-name is usually a vector. However, command history or macros |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
355 ;; recorded in ~/.viper may be recorded as strings. So, convert to |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
356 ;; vectors. |
19079 | 357 (setq macro-name (viper-fixup-macro macro-name)) |
358 (if (viper-char-array-p macro-name) | |
359 (setq macro-name (viper-char-array-to-macro macro-name))) | |
360 (setq macro-body (viper-fixup-macro macro-body)) | |
361 (if (viper-char-array-p macro-body) | |
362 (setq macro-body (viper-char-array-to-macro macro-body))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
363 |
10789 | 364 ;; don't ask if scope is given and is of the right type |
365 (or (eq scope t) | |
366 (stringp scope) | |
367 (and scope (symbolp scope)) | |
368 (progn | |
369 (setq scope | |
370 (cond | |
371 ((y-or-n-p | |
372 (format | |
373 "Map this macro for buffer `%s' only? " | |
374 (buffer-name))) | |
375 (setq msg | |
376 (format | |
377 "%S is mapped to %s for %s in `%s'" | |
19079 | 378 (viper-display-macro macro-name) |
379 (viper-abbreviate-string | |
10789 | 380 (format |
381 "%S" | |
19079 | 382 (setq temp (viper-display-macro macro-body))) |
10789 | 383 14 "" "" |
384 (if (stringp temp) " ....\"" " ....]")) | |
385 state-name (buffer-name))) | |
386 (buffer-name)) | |
387 ((y-or-n-p | |
388 (format | |
389 "Map this macro for the major mode `%S' only? " | |
390 major-mode)) | |
391 (setq msg | |
392 (format | |
393 "%S is mapped to %s for %s in `%S'" | |
19079 | 394 (viper-display-macro macro-name) |
395 (viper-abbreviate-string | |
10789 | 396 (format |
397 "%S" | |
19079 | 398 (setq temp (viper-display-macro macro-body))) |
10789 | 399 14 "" "" |
400 (if (stringp macro-body) " ....\"" " ....]")) | |
401 state-name major-mode)) | |
402 major-mode) | |
403 (t | |
404 (setq msg | |
405 (format | |
406 "%S is globally mapped to %s in %s" | |
19079 | 407 (viper-display-macro macro-name) |
408 (viper-abbreviate-string | |
10789 | 409 (format |
410 "%S" | |
19079 | 411 (setq temp (viper-display-macro macro-body))) |
10789 | 412 14 "" "" |
413 (if (stringp macro-body) " ....\"" " ....]")) | |
414 state-name)) | |
415 t))) | |
14580
1883960762e0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14433
diff
changeset
|
416 (if (y-or-n-p |
1883960762e0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14433
diff
changeset
|
417 (format "Save this macro in %s? " |
19079 | 418 (viper-abbreviate-file-name viper-custom-file-name))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
419 (viper-save-string-in-file |
19079 | 420 (format "\n(viper-record-kbd-macro %S '%S %s '%S)" |
421 (viper-display-macro macro-name) | |
13211
76308c9753ab
(vip-record-kbd-macro): correctly escapes `.' and `[' now.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12695
diff
changeset
|
422 state |
76308c9753ab
(vip-record-kbd-macro): correctly escapes `.' and `[' now.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12695
diff
changeset
|
423 ;; if we don't let vector macro-body through %S, |
76308c9753ab
(vip-record-kbd-macro): correctly escapes `.' and `[' now.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12695
diff
changeset
|
424 ;; the symbols `\.' `\[' etc will be converted into |
76308c9753ab
(vip-record-kbd-macro): correctly escapes `.' and `[' now.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12695
diff
changeset
|
425 ;; characters, causing invalid read error on recorded |
19079 | 426 ;; macros in .viper. |
13211
76308c9753ab
(vip-record-kbd-macro): correctly escapes `.' and `[' now.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12695
diff
changeset
|
427 ;; I am not sure is macro-body can still be a string at |
76308c9753ab
(vip-record-kbd-macro): correctly escapes `.' and `[' now.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12695
diff
changeset
|
428 ;; this point, but I am preserving this option anyway. |
76308c9753ab
(vip-record-kbd-macro): correctly escapes `.' and `[' now.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12695
diff
changeset
|
429 (if (vectorp macro-body) |
76308c9753ab
(vip-record-kbd-macro): correctly escapes `.' and `[' now.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12695
diff
changeset
|
430 (format "%S" macro-body) |
76308c9753ab
(vip-record-kbd-macro): correctly escapes `.' and `[' now.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12695
diff
changeset
|
431 macro-body) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
432 scope) |
19079 | 433 viper-custom-file-name)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
434 |
65589
0670efd1e2df
message format spec fixes, commit # 8
Deepak Goel <deego@gnufans.org>
parents:
64701
diff
changeset
|
435 (message "%s" msg) |
10789 | 436 )) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
437 |
10789 | 438 (setq new-elt |
439 (cons macro-name | |
440 (cond ((eq scope t) (list nil nil (cons t nil))) | |
441 ((symbolp scope) | |
442 (list nil (list (cons scope nil)) (cons t nil))) | |
443 ((stringp scope) | |
444 (list (list (cons scope nil)) nil (cons t nil)))))) | |
445 (setq old-elt (assoc macro-name (eval macro-alist-var))) | |
446 | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
447 (if (null old-elt) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
448 (progn |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
449 ;; insert new-elt in macro-alist-var and keep the list sorted |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
450 (define-key |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
451 keymap |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
452 (vector (viper-key-to-emacs-key (aref macro-name 0))) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
453 'viper-exec-mapped-kbd-macro) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
454 (setq lis (eval macro-alist-var)) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
455 (while (and lis (string< (viper-array-to-string (car (car lis))) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
456 (viper-array-to-string macro-name))) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
457 (setq lis2 (cons (car lis) lis2)) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
458 (setq lis (cdr lis))) |
84907
80f409ec2b40
(viper-describe-kbd-macros, viper-describe-one-macro):
Juanma Barranquero <lekktu@gmail.com>
parents:
78218
diff
changeset
|
459 |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
460 (setq lis2 (reverse lis2)) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
461 (set macro-alist-var (append lis2 (cons new-elt lis))) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
462 (setq old-elt new-elt))) |
10789 | 463 (setq old-sub-elt |
19079 | 464 (cond ((eq scope t) (viper-kbd-global-pair old-elt)) |
465 ((symbolp scope) (assoc scope (viper-kbd-mode-alist old-elt))) | |
466 ((stringp scope) (assoc scope (viper-kbd-buf-alist old-elt))))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
467 (if old-sub-elt |
10789 | 468 (setcdr old-sub-elt macro-body) |
469 (cond ((symbolp scope) (setcar (cdr (cdr old-elt)) | |
470 (cons (cons scope macro-body) | |
19079 | 471 (viper-kbd-mode-alist old-elt)))) |
10789 | 472 ((stringp scope) (setcar (cdr old-elt) |
473 (cons (cons scope macro-body) | |
19079 | 474 (viper-kbd-buf-alist old-elt)))))) |
10789 | 475 )) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
476 |
10789 | 477 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
478 |
19079 | 479 ;; macro name must be a vector of viper-style keys |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
480 ;; viper-unrecord-kbd-macro doesn't have scope. Macro definitions are inherited |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
481 ;; from global -> major mode -> buffer |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
482 ;; More specific definition overrides more general |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
483 ;; Can't unrecord definition for more specific, if a more general definition is |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
484 ;; in effect |
19079 | 485 (defun viper-unrecord-kbd-macro (macro-name state) |
12140
75379a19c5d5
Changed vip-*-frame-* to *-frame-*, incorporated overlay strings,
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
486 "Delete macro MACRO-NAME from Viper STATE. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
487 MACRO-NAME must be a vector of viper-style keys. This command is used by Viper |
19079 | 488 internally, but the user can also use it in ~/.viper to delete pre-defined |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
489 macros supplied with Viper. The best way to avoid mistakes in macro names to |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
490 be passed to this function is to use viper-describe-kbd-macros and copy the |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
491 name from there." |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
492 (let* (state-name keymap |
10789 | 493 (macro-alist-var |
494 (cond ((eq state 'vi-state) | |
495 (setq state-name "Vi state" | |
19079 | 496 keymap viper-vi-kbd-map) |
497 'viper-vi-kbd-macro-alist) | |
10789 | 498 ((memq state '(insert-state replace-state)) |
499 (setq state-name "Insert state" | |
19079 | 500 keymap viper-insert-kbd-map) |
501 'viper-insert-kbd-macro-alist) | |
10789 | 502 (t |
503 (setq state-name "Emacs state" | |
19079 | 504 keymap viper-emacs-kbd-map) |
505 'viper-emacs-kbd-macro-alist) | |
10789 | 506 )) |
507 buf-mapping mode-mapping global-mapping | |
508 macro-pair macro-entry) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
509 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
510 ;; Macro-name is usually a vector. However, command history or macros |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
511 ;; recorded in ~/.viper may appear as strings. So, convert to vectors. |
19079 | 512 (setq macro-name (viper-fixup-macro macro-name)) |
513 (if (viper-char-array-p macro-name) | |
514 (setq macro-name (viper-char-array-to-macro macro-name))) | |
10789 | 515 |
516 (setq macro-entry (assoc macro-name (eval macro-alist-var))) | |
517 (if (= (length macro-name) 0) | |
518 (error "Can't unmap an empty macro name")) | |
519 (if (null macro-entry) | |
520 (error "%S is not mapped to a macro for %s in `%s'" | |
19079 | 521 (viper-display-macro macro-name) |
10789 | 522 state-name (buffer-name))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
523 |
19079 | 524 (setq buf-mapping (viper-kbd-buf-pair macro-entry) |
525 mode-mapping (viper-kbd-mode-pair macro-entry) | |
526 global-mapping (viper-kbd-global-pair macro-entry)) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
527 |
10789 | 528 (cond ((and (cdr buf-mapping) |
529 (or (and (not (cdr mode-mapping)) (not (cdr global-mapping))) | |
530 (y-or-n-p | |
531 (format "Unmap %S for `%s' only? " | |
19079 | 532 (viper-display-macro macro-name) |
10789 | 533 (buffer-name))))) |
534 (setq macro-pair buf-mapping) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
535 (message "%S is unmapped for %s in `%s'" |
19079 | 536 (viper-display-macro macro-name) |
10789 | 537 state-name (buffer-name))) |
538 ((and (cdr mode-mapping) | |
539 (or (not (cdr global-mapping)) | |
540 (y-or-n-p | |
541 (format "Unmap %S for the major mode `%S' only? " | |
19079 | 542 (viper-display-macro macro-name) |
10789 | 543 major-mode)))) |
544 (setq macro-pair mode-mapping) | |
545 (message "%S is unmapped for %s in %S" | |
19079 | 546 (viper-display-macro macro-name) state-name major-mode)) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
547 ((cdr (setq macro-pair global-mapping)) |
10789 | 548 (message |
18839 | 549 "Global mapping for %S in %s is removed" |
19079 | 550 (viper-display-macro macro-name) state-name)) |
10789 | 551 (t (error "%S is not mapped to a macro for %s in `%s'" |
19079 | 552 (viper-display-macro macro-name) |
10789 | 553 state-name (buffer-name)))) |
554 (setcdr macro-pair nil) | |
555 (or (cdr buf-mapping) | |
556 (cdr mode-mapping) | |
557 (cdr global-mapping) | |
558 (progn | |
559 (set macro-alist-var (delq macro-entry (eval macro-alist-var))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
560 (if (viper-can-release-key (aref macro-name 0) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
561 (eval macro-alist-var)) |
10789 | 562 (define-key |
563 keymap | |
19079 | 564 (vector (viper-key-to-emacs-key (aref macro-name 0))) |
10789 | 565 nil)) |
566 )) | |
567 )) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
568 |
12140
75379a19c5d5
Changed vip-*-frame-* to *-frame-*, incorporated overlay strings,
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
569 ;; Check if MACRO-ALIST has an entry for a macro name starting with |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
570 ;; CHAR. If not, this indicates that the binding for this char |
19079 | 571 ;; in viper-vi/insert-kbd-map can be released. |
572 (defun viper-can-release-key (char macro-alist) | |
10789 | 573 (let ((lis macro-alist) |
574 (can-release t) | |
575 macro-name) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
576 |
10789 | 577 (while (and lis can-release) |
578 (setq macro-name (car (car lis))) | |
579 (if (eq char (aref macro-name 0)) | |
580 (setq can-release nil)) | |
581 (setq lis (cdr lis))) | |
582 can-release)) | |
583 | |
584 | |
19079 | 585 (defun viper-exec-mapped-kbd-macro (count) |
10789 | 586 "Dispatch kbd macro." |
587 (interactive "P") | |
19079 | 588 (let* ((macro-alist (cond ((eq viper-current-state 'vi-state) |
589 viper-vi-kbd-macro-alist) | |
590 ((memq viper-current-state | |
10789 | 591 '(insert-state replace-state)) |
19079 | 592 viper-insert-kbd-macro-alist) |
10789 | 593 (t |
19079 | 594 viper-emacs-kbd-macro-alist))) |
10789 | 595 (unmatched-suffix "") |
596 ;; Macros and keys are executed with other macros turned off | |
597 ;; For macros, this is done to avoid macro recursion | |
19079 | 598 viper-vi-kbd-minor-mode viper-insert-kbd-minor-mode |
599 viper-emacs-kbd-minor-mode | |
10789 | 600 next-best-match keyseq event-seq |
601 macro-first-char macro-alist-elt macro-body | |
602 command) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
603 |
10789 | 604 (setq macro-first-char last-command-event |
19079 | 605 event-seq (viper-read-fast-keysequence macro-first-char macro-alist) |
606 keyseq (viper-events-to-macro event-seq) | |
10789 | 607 macro-alist-elt (assoc keyseq macro-alist) |
19079 | 608 next-best-match (viper-find-best-matching-macro macro-alist keyseq)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
609 |
10789 | 610 (if (null macro-alist-elt) |
611 (setq macro-alist-elt (car next-best-match) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
612 unmatched-suffix (viper-subseq event-seq (cdr next-best-match)))) |
10789 | 613 |
614 (cond ((null macro-alist-elt)) | |
19079 | 615 ((setq macro-body (viper-kbd-buf-definition macro-alist-elt))) |
616 ((setq macro-body (viper-kbd-mode-definition macro-alist-elt))) | |
617 ((setq macro-body (viper-kbd-global-definition macro-alist-elt)))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
618 |
10789 | 619 ;; when defining keyboard macro, don't use the macro mappings |
620 (if (and macro-body (not defining-kbd-macro)) | |
621 ;; block cmd executed as part of a macro from entering command history | |
622 (let ((command-history command-history)) | |
19079 | 623 (setq viper-this-kbd-macro (car macro-alist-elt)) |
624 (execute-kbd-macro (viper-macro-to-events macro-body) count) | |
625 (setq viper-this-kbd-macro nil | |
626 viper-last-kbd-macro (car macro-alist-elt)) | |
627 (viper-set-unread-command-events unmatched-suffix)) | |
10789 | 628 ;; If not a macro, or the macro is suppressed while defining another |
629 ;; macro, put keyseq back on the event queue | |
19079 | 630 (viper-set-unread-command-events event-seq) |
10789 | 631 ;; if the user typed arg, then use it if prefix arg is not set by |
632 ;; some other command (setting prefix arg can happen if we do, say, | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
633 ;; 2dw and there is a macro starting with 2. Then control will go to |
10789 | 634 ;; this routine |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
635 (or prefix-arg (setq prefix-arg count)) |
10789 | 636 (setq command (key-binding (read-key-sequence nil))) |
637 (if (commandp command) | |
638 (command-execute command) | |
639 (beep 1))) | |
640 )) | |
641 | |
642 | |
643 | |
644 ;;; Displaying and completing macros | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
645 |
19079 | 646 (defun viper-describe-kbd-macros () |
10789 | 647 "Show currently defined keyboard macros." |
648 (interactive) | |
19079 | 649 (with-output-to-temp-buffer " *viper-info*" |
10789 | 650 (princ "Macros in Vi state:\n===================\n") |
84907
80f409ec2b40
(viper-describe-kbd-macros, viper-describe-one-macro):
Juanma Barranquero <lekktu@gmail.com>
parents:
78218
diff
changeset
|
651 (mapc 'viper-describe-one-macro viper-vi-kbd-macro-alist) |
10789 | 652 (princ "\n\nMacros in Insert and Replace states:\n====================================\n") |
84907
80f409ec2b40
(viper-describe-kbd-macros, viper-describe-one-macro):
Juanma Barranquero <lekktu@gmail.com>
parents:
78218
diff
changeset
|
653 (mapc 'viper-describe-one-macro viper-insert-kbd-macro-alist) |
10789 | 654 (princ "\n\nMacros in Emacs state:\n======================\n") |
19079 | 655 (mapcar 'viper-describe-one-macro viper-emacs-kbd-macro-alist) |
10789 | 656 )) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
657 |
19079 | 658 (defun viper-describe-one-macro (macro) |
10789 | 659 (princ (format "\n *** Mappings for %S:\n ------------\n" |
19079 | 660 (viper-display-macro (car macro)))) |
10789 | 661 (princ " ** Buffer-specific:") |
19079 | 662 (if (viper-kbd-buf-alist macro) |
84907
80f409ec2b40
(viper-describe-kbd-macros, viper-describe-one-macro):
Juanma Barranquero <lekktu@gmail.com>
parents:
78218
diff
changeset
|
663 (mapc 'viper-describe-one-macro-elt (viper-kbd-buf-alist macro)) |
10789 | 664 (princ " none\n")) |
665 (princ "\n ** Mode-specific:") | |
19079 | 666 (if (viper-kbd-mode-alist macro) |
84907
80f409ec2b40
(viper-describe-kbd-macros, viper-describe-one-macro):
Juanma Barranquero <lekktu@gmail.com>
parents:
78218
diff
changeset
|
667 (mapc 'viper-describe-one-macro-elt (viper-kbd-mode-alist macro)) |
10789 | 668 (princ " none\n")) |
669 (princ "\n ** Global:") | |
19079 | 670 (if (viper-kbd-global-definition macro) |
671 (princ (format "\n %S" (cdr (viper-kbd-global-pair macro)))) | |
10789 | 672 (princ " none")) |
673 (princ "\n")) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
674 |
19079 | 675 (defun viper-describe-one-macro-elt (elt) |
10789 | 676 (let ((name (car elt)) |
677 (defn (cdr elt))) | |
678 (princ (format "\n * %S:\n %S\n" name defn)))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
679 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
680 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
681 |
10789 | 682 ;; check if SEQ is a prefix of some car of an element in ALIST |
19079 | 683 (defun viper-keyseq-is-a-possible-macro (seq alist) |
684 (let ((converted-seq (viper-events-to-macro seq))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
685 (eval (cons 'or |
10789 | 686 (mapcar |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
687 (lambda (elt) (viper-prefix-subseq-p converted-seq elt)) |
19079 | 688 (viper-this-buffer-macros alist)))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
689 |
10789 | 690 ;; whether SEQ1 is a prefix of SEQ2 |
19079 | 691 (defun viper-prefix-subseq-p (seq1 seq2) |
10789 | 692 (let ((len1 (length seq1)) |
693 (len2 (length seq2))) | |
694 (if (<= len1 len2) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
695 (equal seq1 (viper-subseq seq2 0 len1))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
696 |
10789 | 697 ;; find the longest common prefix |
19079 | 698 (defun viper-common-seq-prefix (&rest seqs) |
10789 | 699 (let* ((first (car seqs)) |
700 (rest (cdr seqs)) | |
701 (pref []) | |
702 (idx 0) | |
703 len) | |
704 (if (= (length seqs) 0) | |
705 (setq len 0) | |
706 (setq len (apply 'min (mapcar 'length seqs)))) | |
707 (while (< idx len) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
708 (if (eval (cons 'and |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
709 (mapcar (lambda (s) (equal (elt first idx) (elt s idx))) |
10789 | 710 rest))) |
711 (setq pref (vconcat pref (vector (elt first idx))))) | |
712 (setq idx (1+ idx))) | |
713 pref)) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
714 |
10789 | 715 ;; get all sequences that match PREFIX from a given A-LIST |
19079 | 716 (defun viper-extract-matching-alist-members (pref alist) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
717 (delq nil (mapcar (lambda (elt) (if (viper-prefix-subseq-p pref elt) elt)) |
19079 | 718 (viper-this-buffer-macros alist)))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
719 |
19079 | 720 (defun viper-do-sequence-completion (seq alist compl-message) |
721 (let* ((matches (viper-extract-matching-alist-members seq alist)) | |
722 (new-seq (apply 'viper-common-seq-prefix matches)) | |
10789 | 723 ) |
724 (cond ((and (equal seq new-seq) (= (length matches) 1)) | |
725 (message "%s (Sole completion)" compl-message) | |
726 (sit-for 2)) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
727 ((null matches) |
10789 | 728 (message "%s (No match)" compl-message) |
729 (sit-for 2) | |
730 (setq new-seq seq)) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
731 ((member seq matches) |
10789 | 732 (message "%s (Complete, but not unique)" compl-message) |
733 (sit-for 2) | |
19079 | 734 (viper-display-vector-completions matches)) |
10789 | 735 ((equal seq new-seq) |
19079 | 736 (viper-display-vector-completions matches))) |
10789 | 737 new-seq)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
738 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
739 |
19079 | 740 (defun viper-display-vector-completions (list) |
10789 | 741 (with-output-to-temp-buffer "*Completions*" |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
742 (display-completion-list |
10789 | 743 (mapcar 'prin1-to-string |
19079 | 744 (mapcar 'viper-display-macro list))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
745 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
746 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
747 |
10789 | 748 ;; alist is the alist of macros |
749 ;; str is the fast key sequence entered | |
750 ;; returns: (matching-macro-def . unmatched-suffix-start-index) | |
19079 | 751 (defun viper-find-best-matching-macro (alist str) |
10789 | 752 (let ((lis alist) |
753 (def-len 0) | |
754 (str-len (length str)) | |
755 match unmatched-start-idx found macro-def) | |
756 (while (and (not found) lis) | |
757 (setq macro-def (car lis) | |
758 def-len (length (car macro-def))) | |
759 (if (and (>= str-len def-len) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
760 (equal (car macro-def) (viper-subseq str 0 def-len))) |
19079 | 761 (if (or (viper-kbd-buf-definition macro-def) |
762 (viper-kbd-mode-definition macro-def) | |
763 (viper-kbd-global-definition macro-def)) | |
10789 | 764 (setq found t)) |
765 ) | |
766 (setq lis (cdr lis))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
767 |
10789 | 768 (if found |
769 (setq match macro-def | |
770 unmatched-start-idx def-len) | |
771 (setq match nil | |
772 unmatched-start-idx 0)) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
773 |
10789 | 774 (cons match unmatched-start-idx))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
775 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
776 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
777 |
10789 | 778 ;; returns a list of names of macros defined for the current buffer |
19079 | 779 (defun viper-this-buffer-macros (macro-alist) |
10789 | 780 (let (candidates) |
781 (setq candidates | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
782 (mapcar (lambda (elt) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
783 (if (or (viper-kbd-buf-definition elt) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
784 (viper-kbd-mode-definition elt) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
785 (viper-kbd-global-definition elt)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
786 (car elt))) |
10789 | 787 macro-alist)) |
788 (setq candidates (delq nil candidates)))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
789 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
790 |
12140
75379a19c5d5
Changed vip-*-frame-* to *-frame-*, incorporated overlay strings,
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
791 ;; if seq of Viper key symbols (representing a macro) can be converted to a |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
792 ;; string--do so. Otherwise, do nothing. |
19079 | 793 (defun viper-display-macro (macro-name-or-body) |
794 (cond ((viper-char-symbol-sequence-p macro-name-or-body) | |
14585
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
795 (mapconcat 'symbol-name macro-name-or-body "")) |
19079 | 796 ((viper-char-array-p macro-name-or-body) |
14585
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
797 (mapconcat 'char-to-string macro-name-or-body "")) |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
798 (t macro-name-or-body))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
799 |
14587
542db2bd7e38
(vip-events-to-macro): discard events represented as lists in macro
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14585
diff
changeset
|
800 ;; convert sequence of events (that came presumably from emacs kbd macro) into |
542db2bd7e38
(vip-events-to-macro): discard events represented as lists in macro
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14585
diff
changeset
|
801 ;; Viper's macro, which is a vector of the form |
542db2bd7e38
(vip-events-to-macro): discard events represented as lists in macro
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14585
diff
changeset
|
802 ;; [ desc desc ... ] |
542db2bd7e38
(vip-events-to-macro): discard events represented as lists in macro
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14585
diff
changeset
|
803 ;; Each desc is either a symbol of (meta symb), (shift symb), etc. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
804 ;; Here we purge events that happen to be lists. In most cases, these events |
14587
542db2bd7e38
(vip-events-to-macro): discard events represented as lists in macro
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14585
diff
changeset
|
805 ;; got into a macro definition unintentionally; say, when the user moves mouse |
542db2bd7e38
(vip-events-to-macro): discard events represented as lists in macro
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14585
diff
changeset
|
806 ;; during a macro definition, then something like (switch-frame ...) might get |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
807 ;; in. Another reason for purging lists-events is that we can't store them in |
14587
542db2bd7e38
(vip-events-to-macro): discard events represented as lists in macro
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14585
diff
changeset
|
808 ;; textual form (say, in .emacs) and then read them back. |
19079 | 809 (defun viper-events-to-macro (event-seq) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
810 (vconcat (delq nil (mapcar (lambda (elt) (if (consp elt) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
811 nil |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
812 (viper-event-key elt))) |
14587
542db2bd7e38
(vip-events-to-macro): discard events represented as lists in macro
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14585
diff
changeset
|
813 event-seq)))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
814 |
12140
75379a19c5d5
Changed vip-*-frame-* to *-frame-*, incorporated overlay strings,
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
815 ;; convert strings or arrays of characters to Viper macro form |
19079 | 816 (defun viper-char-array-to-macro (array) |
10789 | 817 (let ((vec (vconcat array)) |
818 macro) | |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
84907
diff
changeset
|
819 (if (featurep 'xemacs) |
10789 | 820 (setq macro (mapcar 'character-to-event vec)) |
821 (setq macro vec)) | |
19079 | 822 (vconcat (mapcar 'viper-event-key macro)))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
823 |
14585
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
824 ;; For macros bodies and names, goes over MACRO and checks if all members are |
10789 | 825 ;; names of keys (actually, it only checks if they are symbols or lists |
14585
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
826 ;; if a digit is found, it is converted into a symbol (e.g., 0 -> \0, etc). |
b6228a159e75
(ex-map-read-args,ex-unmap-read-args): fixed messages.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
827 ;; If MACRO is not a list or vector -- doesn't change MACRO. |
19079 | 828 (defun viper-fixup-macro (macro) |
10789 | 829 (let ((len (length macro)) |
830 (idx 0) | |
831 elt break) | |
832 (if (or (vectorp macro) (listp macro)) | |
833 (while (and (< idx len) (not break)) | |
834 (setq elt (elt macro idx)) | |
835 (cond ((numberp elt) | |
836 ;; fix number | |
837 (if (and (<= 0 elt) (<= elt 9)) | |
838 (cond ((arrayp macro) | |
839 (aset macro | |
840 idx | |
841 (intern (char-to-string (+ ?0 elt))))) | |
842 ((listp macro) | |
843 (setcar (nthcdr idx macro) | |
844 (intern (char-to-string (+ ?0 elt))))) | |
845 ))) | |
846 ((listp elt) | |
19079 | 847 (viper-fixup-macro elt)) |
10789 | 848 ((symbolp elt) nil) |
849 (t (setq break t))) | |
850 (setq idx (1+ idx)))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
851 |
10789 | 852 (if break |
853 (error "Wrong type macro component, symbol-or-listp, %S" elt) | |
854 macro))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
855 |
19079 | 856 (defun viper-macro-to-events (macro-body) |
857 (vconcat (mapcar 'viper-key-to-emacs-key macro-body))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
858 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
859 |
10789 | 860 |
861 ;;; Reading fast key sequences | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
862 |
10789 | 863 ;; Assuming that CHAR was the first character in a fast succession of key |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
864 ;; strokes, read the rest. Return the vector of keys that was entered in |
10789 | 865 ;; this fast succession of key strokes. |
866 ;; A fast keysequence is one that is terminated by a pause longer than | |
19079 | 867 ;; viper-fast-keyseq-timeout. |
868 (defun viper-read-fast-keysequence (event macro-alist) | |
10789 | 869 (let ((lis (vector event)) |
870 next-event) | |
19079 | 871 (while (and (viper-fast-keysequence-p) |
93615
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
872 (viper-keyseq-is-a-possible-macro lis macro-alist)) |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
873 ;; Seems that viper-read-event is more robust here. We need to be able to |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
874 ;; place these events on unread-command-events list. If we use |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
875 ;; viper-read-key then events will be converted to keys, and sometimes |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
876 ;; (e.g., (control \[)) those keys differ from the corresponding events. |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
877 ;; So, do not use (setq next-event (viper-read-key)) |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
878 (setq next-event (viper-read-event)) |
19079 | 879 (or (viper-mouse-event-p next-event) |
10789 | 880 (setq lis (vconcat lis (vector next-event))))) |
881 lis)) | |
882 | |
883 | |
884 ;;; Keyboard macros in registers | |
885 | |
886 ;; sets register to last-kbd-macro carefully. | |
19079 | 887 (defun viper-set-register-macro (reg) |
10789 | 888 (if (get-register reg) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
889 (if (y-or-n-p "Register contains data. Overwrite? ") |
10789 | 890 () |
891 (error | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19907
diff
changeset
|
892 "Macro not saved in register. Can still be invoked via `C-x e'"))) |
10789 | 893 (set-register reg last-kbd-macro)) |
894 | |
19079 | 895 (defun viper-register-macro (count) |
10789 | 896 "Keyboard macros in registers - a modified \@ command." |
897 (interactive "P") | |
898 (let ((reg (downcase (read-char)))) | |
899 (cond ((or (and (<= ?a reg) (<= reg ?z))) | |
19079 | 900 (setq viper-last-macro-reg reg) |
10789 | 901 (if defining-kbd-macro |
902 (progn | |
903 (end-kbd-macro) | |
19079 | 904 (viper-set-register-macro reg)) |
10789 | 905 (execute-kbd-macro (get-register reg) count))) |
906 ((or (= ?@ reg) (= ?\^j reg) (= ?\^m reg)) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
907 (if viper-last-macro-reg |
10789 | 908 nil |
909 (error "No previous kbd macro")) | |
19079 | 910 (execute-kbd-macro (get-register viper-last-macro-reg) count)) |
10789 | 911 ((= ?\# reg) |
912 (start-kbd-macro count)) | |
913 ((= ?! reg) | |
914 (setq reg (downcase (read-char))) | |
915 (if (or (and (<= ?a reg) (<= reg ?z))) | |
916 (progn | |
19079 | 917 (setq viper-last-macro-reg reg) |
918 (viper-set-register-macro reg)))) | |
10789 | 919 (t |
14581
4951b11970a1
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14580
diff
changeset
|
920 (error "`%c': Unknown register" reg))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
921 |
10789 | 922 |
19079 | 923 (defun viper-global-execute () |
10789 | 924 "Call last keyboad macro for each line in the region." |
925 (if (> (point) (mark t)) (exchange-point-and-mark)) | |
926 (beginning-of-line) | |
927 (call-last-kbd-macro) | |
928 (while (< (point) (mark t)) | |
929 (forward-line 1) | |
930 (beginning-of-line) | |
931 (call-last-kbd-macro))) | |
932 | |
933 | |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93615
diff
changeset
|
934 ;; arch-tag: ecd3cc5c-8cd0-4bbe-b2ec-7e75a4b7d0aa |
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
26263
diff
changeset
|
935 ;;; viper-macs.el ends here |