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