Mercurial > emacs
annotate lisp/kmacro.el @ 88177:cf8100a82c36
(rmail-output-read-file-name): Make sure search in executed in `rmail-buffer'.
(rmail-output-to-rmail-file): Use `rmail-output-read-file-name'.
(rmail-output-read-rmail-file-name): Deleted.
author | Henrik Enberg <henrik.enberg@telia.com> |
---|---|
date | Tue, 17 Jan 2006 02:34:35 +0000 |
parents | d7ddb3e565de |
children |
rev | line source |
---|---|
46083 | 1 ;;; kmacro.el --- enhanced keyboard macros |
2 | |
88155 | 3 ;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
46083 | 4 |
5 ;; Author: Kim F. Storm <storm@cua.dk> | |
46085
33538dc6ac79
Fixed copyright and keywords.
Kim F. Storm <storm@cua.dk>
parents:
46083
diff
changeset
|
6 ;; Keywords: keyboard convenience |
46083 | 7 |
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 | |
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
88155 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, USA. | |
46083 | 24 |
25 ;;; Commentary: | |
26 | |
27 ;; The kmacro package is an alternative user interface to emacs' | |
28 ;; keyboard macro functionality. This functionality is normally bound | |
46099
d441fc235798
Passed it through checkdoc. Moved `provide' to the end, where it belongs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46085
diff
changeset
|
29 ;; to C-x (, C-x ), and C-x e, but these bindings are too hard to |
46083 | 30 ;; type to be really useful for doing small repeated tasks. |
31 | |
32 ;; With kmacro, two function keys are dedicated to keyboard macros, | |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
33 ;; by default F3 and F4. Personally, I prefer F1 and F2, but those |
46083 | 34 ;; keys already have default bindings. |
35 ;; | |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
36 ;; To start defining a keyboard macro, use F3. To end the macro, |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
37 ;; use F4, and to call the macro also use F4. This makes it very |
46083 | 38 ;; easy to repeat a macro immediately after defining it. |
39 ;; | |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
40 ;; You can call the macro repeatedly by pressing F4 multiple times, or |
46083 | 41 ;; you can give a numeric prefix argument specifying the number of |
42 ;; times to repeat the macro. Macro execution automatically | |
43 ;; terminates when point reaches the end of the buffer or if an error | |
44 ;; is signalled by ringing the bell. | |
45 | |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
46 ;; When you define a macro with F3/F4, it is automatically added to |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
47 ;; the head of the "keyboard macro ring", and F4 actually executes the |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
48 ;; first element of the macro ring. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
49 ;; |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
50 ;; Note: an empty macro is never added to the macro ring. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
51 ;; |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
52 ;; You can execute the second element on the macro ring with C-u F4 or |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
53 ;; C-x C-k C-l, you can use C-x C-k C-p and C-x C-k C-n to cycle |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
54 ;; through the macro ring, and you can swap the first and second |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
55 ;; elements with C-x C-k C-t. To delete the first element in the |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
56 ;; macro ring, use C-x C-k C-d. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
57 ;; |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
58 ;; |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
59 ;; You can also use C-x C-k C-s to start a macro, and C-x C-k C-k to |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
60 ;; end it; then use C-k to execute it immediately, or C-x C-k C-k to |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
61 ;; execute it later. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
62 ;; |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
63 ;; In general, immediately after using C-x C-k followed by one of C-k, |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
64 ;; C-l, C-p, or C-n, you can further cycle the macro ring using C-p or |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
65 ;; C-n, execute the first or second macro using C-k or C-l, delete |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
66 ;; the head macro with C-d, or edit the current macro with C-e without |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
67 ;; repeating the C-x C-k prefix. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
68 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
69 ;; If you enter F3 while defining the macro, the numeric value of |
46083 | 70 ;; `kmacro-counter' is inserted using the `kmacro-counter-format', and |
71 ;; `kmacro-counter' is incremented by 1 (or the numeric prefix value | |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
72 ;; of F3). |
46083 | 73 ;; |
74 ;; The initial value of `kmacro-counter' is 0, or the numeric prefix | |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
75 ;; value given to F3 when starting the macro. |
46083 | 76 ;; |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
77 ;; Now, each time you call the macro using F4, the current |
46083 | 78 ;; value of `kmacro-counter' is inserted and incremented, making it |
79 ;; easy to insert incremental numbers in the buffer. | |
80 ;; | |
81 ;; Example: | |
82 ;; | |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
83 ;; The following sequence: M-5 F3 x M-2 F3 y F4 F4 F4 F4 |
46083 | 84 ;; inserts the following string: x5yx7yx9yx11y |
85 | |
46099
d441fc235798
Passed it through checkdoc. Moved `provide' to the end, where it belongs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46085
diff
changeset
|
86 ;; A macro can also be called using a mouse click, default S-mouse-3. |
46083 | 87 ;; This calls the macro at the point where you click the mouse. |
88 | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
89 ;; You can edit the last macro using C-x C-k C-e. |
46083 | 90 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
91 ;; You can append to the last macro using C-u F3. |
46083 | 92 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
93 ;; You can set the macro counter using C-x C-k C-c, add to it using C-x C-k C-a, |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
94 ;; and you can set the macro counter format with C-x C-k C-f. |
46083 | 95 |
96 ;; The following key bindings are performed: | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
97 ;; |
46083 | 98 ;; Normal While defining macro |
99 ;; --------------------------- ------------------------------ | |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
100 ;; f3 Define macro Insert current counter value |
46083 | 101 ;; Prefix arg specifies initial and increase counter by prefix |
102 ;; counter value (default 0) (default increment: 1) | |
103 ;; | |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
104 ;; C-u f3 APPENDs to last macro |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
105 ;; |
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
106 ;; f4 Call last macro End macro |
46083 | 107 ;; Prefix arg specifies number |
108 ;; of times to execute macro. | |
109 ;; | |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
110 ;; C-u f4 Swap last and head of macro ring. |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
111 ;; |
46083 | 112 ;; S-mouse-3 Set point at click and End macro and execute macro at |
113 ;; execute last macro. click. | |
114 | |
115 ;;; Code: | |
116 | |
46099
d441fc235798
Passed it through checkdoc. Moved `provide' to the end, where it belongs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46085
diff
changeset
|
117 ;; Customization: |
46083 | 118 |
119 (defgroup kmacro nil | |
120 "Simplified keyboard macro user interface." | |
121 :group 'keyboard | |
122 :group 'convenience | |
88155 | 123 :version "22.1" |
46083 | 124 :link '(emacs-commentary-link :tag "Commentary" "kmacro.el") |
125 :link '(emacs-library-link :tag "Lisp File" "kmacro.el")) | |
126 | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
127 (defcustom kmacro-call-mouse-event 'S-mouse-3 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
128 "The mouse event used by kmacro to call a macro. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
129 Set to nil if no mouse binding is desired." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
130 :type 'symbol |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
131 :group 'kmacro) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
132 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
133 (defcustom kmacro-ring-max 8 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
134 "Maximum number of keyboard macros to save in macro ring." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
135 :type 'integer |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
136 :group 'kmacro) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
137 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
138 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
139 (defcustom kmacro-execute-before-append t |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
140 "Controls whether appending to a macro starts by executing the macro. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
141 If non-nil, using a single \\[universal-argument] prefix executes the macro |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
142 before appending, while more than one \\[universal-argument] prefix does not |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
143 execute the macro. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
144 Otherwise, a single \\[universal-argument] prefix does not execute the |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
145 macro, while more than one \\[universal-argument] prefix causes the |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
146 macro to be executed before appending to it." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
147 :type 'boolean |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
148 :group 'kmacro) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
149 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
150 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
151 (defcustom kmacro-repeat-no-prefix t |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
152 "Allow repeating certain macro commands without entering the C-x C-k prefix." |
46083 | 153 :type 'boolean |
154 :group 'kmacro) | |
155 | |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
156 (defcustom kmacro-call-repeat-key t |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
157 "Allow repeating macro call using last key or a specific key." |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
158 :type '(choice (const :tag "Disabled" nil) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
159 (const :tag "Last key" t) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
160 (character :tag "Character" :value ?e) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
161 (symbol :tag "Key symbol" :value RET)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
162 :group 'kmacro) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
163 |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
164 (defcustom kmacro-call-repeat-with-arg nil |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
165 "Repeat macro call with original arg when non-nil; repeat once if nil." |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
166 :type 'boolean |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
167 :group 'kmacro) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
168 |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
169 (defcustom kmacro-step-edit-mini-window-height 0.75 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
170 "Override `max-mini-window-height' when step edit keyboard macro." |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
171 :type 'number |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
172 :group 'kmacro) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
173 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
174 ;; Keymap |
46083 | 175 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
176 (defvar kmacro-keymap |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
177 (let ((map (make-sparse-keymap))) |
88155 | 178 ;; Start, end, execute macros |
47448
3a43982413a6
(kmacro-keymap): Changed bindings:
Kim F. Storm <storm@cua.dk>
parents:
47389
diff
changeset
|
179 (define-key map "s" 'kmacro-start-macro) |
88155 | 180 (define-key map "\C-s" 'kmacro-start-macro) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
181 (define-key map "\C-k" 'kmacro-end-or-call-macro-repeat) |
88155 | 182 (define-key map "r" 'apply-macro-to-region-lines) |
183 (define-key map "q" 'kbd-macro-query) ;; Like C-x q | |
184 | |
185 ;; macro ring | |
186 (define-key map "\C-n" 'kmacro-cycle-ring-next) | |
187 (define-key map "\C-p" 'kmacro-cycle-ring-previous) | |
188 (define-key map "\C-v" 'kmacro-view-macro-repeat) | |
189 (define-key map "\C-d" 'kmacro-delete-ring-head) | |
190 (define-key map "\C-t" 'kmacro-swap-ring) | |
191 (define-key map "\C-l" 'kmacro-call-ring-2nd-repeat) | |
192 | |
193 ;; macro counter | |
194 (define-key map "\C-f" 'kmacro-set-format) | |
195 (define-key map "\C-c" 'kmacro-set-counter) | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
196 (define-key map "\C-i" 'kmacro-insert-counter) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
197 (define-key map "\C-a" 'kmacro-add-counter) |
88155 | 198 |
199 ;; macro editing | |
200 (define-key map "\C-e" 'kmacro-edit-macro-repeat) | |
201 (define-key map "\r" 'kmacro-edit-macro) | |
202 (define-key map "e" 'edit-kbd-macro) | |
203 (define-key map "l" 'kmacro-edit-lossage) | |
204 (define-key map " " 'kmacro-step-edit-macro) | |
205 | |
206 ;; naming and binding | |
47448
3a43982413a6
(kmacro-keymap): Changed bindings:
Kim F. Storm <storm@cua.dk>
parents:
47389
diff
changeset
|
207 (define-key map "b" 'kmacro-bind-to-key) |
88155 | 208 (define-key map "n" 'kmacro-name-last-macro) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
209 map) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
210 "Keymap for keyboard macro commands.") |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
211 (defalias 'kmacro-keymap kmacro-keymap) |
46083 | 212 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
213 ;;; Provide some binding for startup: |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
214 ;;;###autoload (global-set-key "\C-x(" 'kmacro-start-macro) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
215 ;;;###autoload (global-set-key "\C-x)" 'kmacro-end-macro) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
216 ;;;###autoload (global-set-key "\C-xe" 'kmacro-end-and-call-macro) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
217 ;;;###autoload (global-set-key [f3] 'kmacro-start-macro-or-insert-counter) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
218 ;;;###autoload (global-set-key [f4] 'kmacro-end-or-call-macro) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
219 ;;;###autoload (global-set-key "\C-x\C-k" 'kmacro-keymap) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
220 ;;;###autoload (autoload 'kmacro-keymap "kmacro" "Keymap for keyboard macro commands." t 'keymap) |
46083 | 221 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
222 (if kmacro-call-mouse-event |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
223 (global-set-key (vector kmacro-call-mouse-event) 'kmacro-end-call-mouse)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
224 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
225 |
88155 | 226 ;;; Called from keyboard-quit |
227 | |
228 (defun kmacro-keyboard-quit () | |
229 (or (not defining-kbd-macro) | |
230 (eq defining-kbd-macro 'append) | |
231 (kmacro-ring-empty-p) | |
232 (kmacro-pop-ring))) | |
233 | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
234 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
235 ;;; Keyboard macro counter |
46083 | 236 |
237 (defvar kmacro-counter 0 | |
46099
d441fc235798
Passed it through checkdoc. Moved `provide' to the end, where it belongs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46085
diff
changeset
|
238 "*Current keyboard macro counter.") |
46083 | 239 |
88155 | 240 (defvar kmacro-default-counter-format "%d") |
241 | |
46083 | 242 (defvar kmacro-counter-format "%d" |
46099
d441fc235798
Passed it through checkdoc. Moved `provide' to the end, where it belongs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46085
diff
changeset
|
243 "*Current keyboard macro counter format.") |
46083 | 244 |
245 (defvar kmacro-counter-format-start kmacro-counter-format | |
246 "Macro format at start of macro execution.") | |
247 | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
248 (defvar kmacro-counter-value-start kmacro-counter |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
249 "Macro counter at start of macro execution.") |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
250 |
88155 | 251 (defvar kmacro-last-counter 0 |
252 "Last counter inserted by key macro.") | |
253 | |
254 (defvar kmacro-initial-counter-value nil | |
255 "Initial counter value for the next keyboard macro to be defined.") | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
256 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
257 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
258 (defun kmacro-insert-counter (arg) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
259 "Insert macro counter and increment with ARG or 1 if missing. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
260 With \\[universal-argument], insert previous kmacro-counter (but do not modify counter)." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
261 (interactive "P") |
88155 | 262 (if kmacro-initial-counter-value |
263 (setq kmacro-counter kmacro-initial-counter-value | |
264 kmacro-initial-counter-value nil)) | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
265 (if (and arg (listp arg)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
266 (insert (format kmacro-counter-format kmacro-last-counter)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
267 (insert (format kmacro-counter-format kmacro-counter)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
268 (kmacro-add-counter (prefix-numeric-value arg)))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
269 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
270 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
271 (defun kmacro-set-format (format) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
272 "Set macro counter FORMAT." |
88155 | 273 (interactive "sMacro Counter Format: ") |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
274 (setq kmacro-counter-format |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
275 (if (equal format "") "%d" format)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
276 ;; redefine initial macro counter if we are not executing a macro. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
277 (if (not (or defining-kbd-macro executing-kbd-macro)) |
88155 | 278 (setq kmacro-default-counter-format kmacro-counter-format))) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
279 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
280 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
281 (defun kmacro-display-counter (&optional value) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
282 "Display current counter value." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
283 (unless value (setq value kmacro-counter)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
284 (message "New macro counter value: %s (%d)" (format kmacro-counter-format value) value)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
285 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
286 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
287 (defun kmacro-set-counter (arg) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
288 "Set kmacro-counter to ARG or prompt if missing. |
88155 | 289 With \\[universal-argument] prefix, reset counter to its value prior to this iteration of the macro." |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
290 (interactive "NMacro counter value: ") |
88155 | 291 (if (not (or defining-kbd-macro executing-kbd-macro)) |
292 (kmacro-display-counter (setq kmacro-initial-counter-value arg)) | |
293 (setq kmacro-last-counter kmacro-counter | |
294 kmacro-counter (if (and current-prefix-arg (listp current-prefix-arg)) | |
295 kmacro-counter-value-start | |
296 arg)) | |
297 (unless executing-kbd-macro | |
298 (kmacro-display-counter)))) | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
299 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
300 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
301 (defun kmacro-add-counter (arg) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
302 "Add numeric prefix arg (prompt if missing) to macro counter. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
303 With \\[universal-argument], restore previous counter value." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
304 (interactive "NAdd to macro counter: ") |
88155 | 305 (if kmacro-initial-counter-value |
306 (setq kmacro-counter kmacro-initial-counter-value | |
307 kmacro-initial-counter-value nil)) | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
308 (let ((last kmacro-last-counter)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
309 (setq kmacro-last-counter kmacro-counter |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
310 kmacro-counter (if (and current-prefix-arg (listp current-prefix-arg)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
311 last |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
312 kmacro-counter (+ kmacro-counter arg)))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
313 (unless executing-kbd-macro |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
314 (kmacro-display-counter))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
315 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
316 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
317 (defun kmacro-loop-setup-function () |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
318 "Function called prior to each iteration of macro." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
319 ;; Restore macro counter format to initial format, so it is ok to change |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
320 ;; counter format in the macro without restoring it. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
321 (setq kmacro-counter-format kmacro-counter-format-start) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
322 ;; Save initial counter value so we can restore it with C-u kmacro-set-counter. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
323 (setq kmacro-counter-value-start kmacro-counter) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
324 ;; Return non-nil to continue execution. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
325 t) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
326 |
46083 | 327 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
328 ;;; Keyboard macro ring |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
329 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
330 (defvar kmacro-ring nil |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
331 "The keyboard macro ring. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
332 Each element is a list (MACRO COUNTER FORMAT). Actually, the head of |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
333 the macro ring (when defining or executing) is not stored in the ring; |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
334 instead it is available in the variables `last-kbd-macro', `kmacro-counter', |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
335 and `kmacro-counter-format'.") |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
336 |
88155 | 337 ;; Remember what we are currently looking at with kmacro-view-macro. |
338 | |
339 (defvar kmacro-view-last-item nil) | |
340 (defvar kmacro-view-item-no 0) | |
341 | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
342 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
343 (defun kmacro-ring-head () |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
344 "Return pseudo head element in macro ring." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
345 (and last-kbd-macro |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
346 (list last-kbd-macro kmacro-counter kmacro-counter-format-start))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
347 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
348 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
349 (defun kmacro-push-ring (&optional elt) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
350 "Push ELT or current macro onto `kmacro-ring'." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
351 (when (setq elt (or elt (kmacro-ring-head))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
352 (let ((len (length kmacro-ring))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
353 (setq kmacro-ring (cons elt kmacro-ring)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
354 (if (>= len kmacro-ring-max) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
355 (setcdr (nthcdr len kmacro-ring) nil))))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
356 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
357 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
358 (defun kmacro-split-ring-element (elt) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
359 (setq last-kbd-macro (car elt) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
360 kmacro-counter (nth 1 elt) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
361 kmacro-counter-format-start (nth 2 elt))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
362 |
46083 | 363 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
364 (defun kmacro-pop-ring1 (&optional raw) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
365 "Pop head element off macro ring (no check). |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
366 Non-nil arg RAW means just return raw first element." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
367 (prog1 (car kmacro-ring) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
368 (unless raw |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
369 (kmacro-split-ring-element (car kmacro-ring))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
370 (setq kmacro-ring (cdr kmacro-ring)))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
371 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
372 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
373 (defun kmacro-pop-ring (&optional raw) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
374 "Pop head element off macro ring. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
375 Non-nil arg RAW means just return raw first element." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
376 (unless (kmacro-ring-empty-p) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
377 (kmacro-pop-ring1 raw))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
378 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
379 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
380 (defun kmacro-ring-length () |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
381 "Return length of macro ring, including pseudo head." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
382 (+ (if last-kbd-macro 1 0) (length kmacro-ring))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
383 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
384 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
385 (defun kmacro-ring-empty-p (&optional none) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
386 "Tell user and return t if `last-kbd-macro' is nil or `kmacro-ring' is empty. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
387 Check only `last-kbd-macro' if optional arg NONE is non-nil." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
388 (while (and (null last-kbd-macro) kmacro-ring) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
389 (kmacro-pop-ring1)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
390 (cond |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
391 ((null last-kbd-macro) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
392 (message "No keyboard macro defined.") |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
393 t) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
394 ((and (null none) (null kmacro-ring)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
395 (message "Only one keyboard macro defined.") |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
396 t) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
397 (t nil))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
398 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
399 |
88155 | 400 (defun kmacro-display (macro &optional trunc descr empty) |
401 "Display a keyboard MACRO. | |
402 Optional arg TRUNC non-nil specifies to limit width of macro to 60 chars. | |
403 Optional arg DESCR is descriptive text for macro; default is \"Macro:\". | |
404 Optional arg EMPTY is message to print if no macros are defined." | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
405 (if macro |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
406 (let* ((x 60) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
407 (m (format-kbd-macro macro)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
408 (l (length m)) |
88155 | 409 (z (and trunc (> l x)))) |
410 (message "%s%s: %s%s" (or descr "Macro") | |
411 (if (= kmacro-counter 0) "" | |
412 (format " [%s]" | |
413 (format kmacro-counter-format-start kmacro-counter))) | |
414 (if z (substring m 0 (1- x)) m) (if z "..." ""))) | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
415 (message (or empty "No keyboard macros defined")))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
416 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
417 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
418 (defun kmacro-repeat-on-last-key (keys) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
419 "Process kmacro commands keys immidiately after cycling the ring." |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
420 (setq keys (vconcat keys)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
421 (let ((n (1- (length keys))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
422 cmd done repeat) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
423 (while (and last-kbd-macro |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
424 (not done) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
425 (aset keys n (read-event)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
426 (setq cmd (key-binding keys t)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
427 (setq repeat (get cmd 'kmacro-repeat))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
428 (clear-this-command-keys t) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
429 (cond |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
430 ((eq repeat 'ring) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
431 (if kmacro-ring |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
432 (let ((kmacro-repeat-no-prefix nil)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
433 (funcall cmd nil)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
434 (kmacro-display last-kbd-macro t))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
435 ((eq repeat 'head) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
436 (let ((kmacro-repeat-no-prefix nil)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
437 (funcall cmd nil))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
438 ((eq repeat 'stop) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
439 (funcall cmd nil) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
440 (setq done t))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
441 (setq last-input-event nil))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
442 (when last-input-event |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
443 (clear-this-command-keys t) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
444 (setq unread-command-events (list last-input-event)))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
445 |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
446 |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
447 (defun kmacro-get-repeat-prefix () |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
448 (let (keys) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
449 (and kmacro-repeat-no-prefix |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
450 (setq keys (this-single-command-keys)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
451 (> (length keys) 1) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
452 keys))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
453 |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
454 |
88155 | 455 (defun kmacro-exec-ring-item (item arg) |
456 "Execute item ITEM from the macro ring." | |
457 ;; Use counter and format specific to the macro on the ring! | |
458 (let ((kmacro-counter (nth 1 item)) | |
459 (kmacro-counter-format-start (nth 2 item))) | |
460 (execute-kbd-macro (car item) arg #'kmacro-loop-setup-function) | |
461 (setcar (cdr item) kmacro-counter))) | |
462 | |
463 | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
464 (defun kmacro-call-ring-2nd (arg) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
465 "Execute second keyboard macro at in macro ring." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
466 (interactive "P") |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
467 (unless (kmacro-ring-empty-p) |
88155 | 468 (kmacro-exec-ring-item (car kmacro-ring) arg))) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
469 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
470 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
471 (defun kmacro-call-ring-2nd-repeat (arg) |
88155 | 472 "Execute second keyboard macro at in macro ring. |
473 This is like `kmacro-call-ring-2nd', but allows repeating macro commands | |
474 without repeating the prefix." | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
475 (interactive "P") |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
476 (let ((keys (kmacro-get-repeat-prefix))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
477 (kmacro-call-ring-2nd arg) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
478 (if (and kmacro-ring keys) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
479 (kmacro-repeat-on-last-key keys)))) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
480 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
481 (put 'kmacro-call-ring-2nd-repeat 'kmacro-repeat 'head) |
46083 | 482 |
483 | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
484 (defun kmacro-view-ring-2nd () |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
485 "Display the current head of the keyboard macro ring." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
486 (interactive) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
487 (unless (kmacro-ring-empty-p) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
488 (kmacro-display (car (car kmacro-ring)) "2nd macro"))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
489 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
490 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
491 (defun kmacro-cycle-ring-next (&optional arg) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
492 "Move to next keyboard macro in keyboard macro ring. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
493 Displays the selected macro in the echo area." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
494 (interactive) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
495 (unless (kmacro-ring-empty-p) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
496 (kmacro-push-ring) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
497 (let* ((keys (kmacro-get-repeat-prefix)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
498 (len (length kmacro-ring)) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
499 (tail (nthcdr (- len 2) kmacro-ring)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
500 (elt (car (cdr tail)))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
501 (setcdr tail nil) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
502 (kmacro-split-ring-element elt) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
503 (kmacro-display last-kbd-macro t) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
504 (if keys |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
505 (kmacro-repeat-on-last-key keys))))) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
506 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
507 (put 'kmacro-cycle-ring-next 'kmacro-repeat 'ring) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
508 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
509 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
510 (defun kmacro-cycle-ring-previous (&optional arg) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
511 "Move to previous keyboard macro in keyboard macro ring. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
512 Displays the selected macro in the echo area." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
513 (interactive) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
514 (unless (kmacro-ring-empty-p) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
515 (let ((keys (kmacro-get-repeat-prefix)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
516 (cur (kmacro-ring-head))) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
517 (kmacro-pop-ring1) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
518 (if kmacro-ring |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
519 (nconc kmacro-ring (list cur)) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
520 (setq kmacro-ring (list cur))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
521 (kmacro-display last-kbd-macro t) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
522 (if keys |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
523 (kmacro-repeat-on-last-key keys))))) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
524 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
525 (put 'kmacro-cycle-ring-previous 'kmacro-repeat 'ring) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
526 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
527 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
528 (defun kmacro-swap-ring () |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
529 "Swap first two elements on keyboard macro ring." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
530 (interactive) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
531 (unless (kmacro-ring-empty-p) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
532 (let ((cur (kmacro-ring-head))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
533 (kmacro-pop-ring1) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
534 (kmacro-push-ring cur)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
535 (kmacro-display last-kbd-macro t))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
536 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
537 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
538 (defun kmacro-delete-ring-head (&optional arg) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
539 "Delete current macro from keyboard macro ring." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
540 (interactive) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
541 (unless (kmacro-ring-empty-p t) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
542 (if (null kmacro-ring) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
543 (setq last-kbd-macro nil) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
544 (kmacro-pop-ring)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
545 (kmacro-display last-kbd-macro t nil "Keyboard macro ring is now empty."))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
546 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
547 (put 'kmacro-delete-ring-head 'kmacro-repeat 'head) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
548 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
549 ;;; Traditional bindings: |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
550 |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
551 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
552 ;;;###autoload |
46083 | 553 (defun kmacro-start-macro (arg) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
554 "Record subsequent keyboard input, defining a keyboard macro. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
555 The commands are recorded even as they are executed. |
47051
11f467f2a131
(kmacro-start-macro): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
46972
diff
changeset
|
556 Use \\[kmacro-end-macro] to finish recording and make the macro available. |
47457
cff78e8e5a0a
(kmacro-start-macro): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
47448
diff
changeset
|
557 Use \\[kmacro-end-and-call-macro] to execute the macro. |
88155 | 558 |
559 Non-nil arg (prefix arg) means append to last macro defined. | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
560 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
561 With \\[universal-argument] prefix, append to last keyboard macro |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
562 defined. Depending on `kmacro-execute-before-append', this may begin |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
563 by re-executing the last macro as if you typed it again. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
564 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
565 Otherwise, it sets `kmacro-counter' to ARG or 0 if missing before |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
566 defining the macro. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
567 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
568 Use \\[kmacro-insert-counter] to insert (and increment) the macro counter. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
569 The counter value can be set or modified via \\[kmacro-set-counter] and \\[kmacro-add-counter]. |
88155 | 570 The format of the counter can be modified via \\[kmacro-set-format]. |
571 | |
572 Use \\[kmacro-name-last-macro] to give it a permanent name. | |
573 Use \\[kmacro-bind-to-key] to bind it to a key sequence." | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
574 (interactive "P") |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
575 (if (or defining-kbd-macro executing-kbd-macro) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
576 (message "Already defining keyboard macro.") |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
577 (let ((append (and arg (listp arg)))) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
578 (unless append |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
579 (if last-kbd-macro |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
580 (let ((len (length kmacro-ring))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
581 (setq kmacro-ring |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
582 (cons |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
583 (list last-kbd-macro kmacro-counter kmacro-counter-format-start) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
584 kmacro-ring)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
585 (if (>= len kmacro-ring-max) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
586 (setcdr (nthcdr len kmacro-ring) nil)))) |
88155 | 587 (setq kmacro-counter (or (if arg (prefix-numeric-value arg)) |
588 kmacro-initial-counter-value | |
589 0) | |
590 kmacro-initial-counter-value nil | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
591 kmacro-counter-value-start kmacro-counter |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
592 kmacro-last-counter kmacro-counter |
88155 | 593 kmacro-counter-format kmacro-default-counter-format |
594 kmacro-counter-format-start kmacro-default-counter-format)) | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
595 |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
596 (start-kbd-macro append |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
597 (and append |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
598 (if kmacro-execute-before-append |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
599 (> (car arg) 4) |
88155 | 600 (= (car arg) 4)))) |
601 (if (and defining-kbd-macro append) | |
602 (setq defining-kbd-macro 'append))))) | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
603 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
604 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
605 ;;;###autoload |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
606 (defun kmacro-end-macro (arg) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
607 "Finish defining a keyboard macro. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
608 The definition was started by \\[kmacro-start-macro]. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
609 The macro is now available for use via \\[kmacro-call-macro], |
88155 | 610 or it can be given a name with \\[kmacro-name-last-macro] and then invoked |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
611 under that name. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
612 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
613 With numeric arg, repeat macro now that many times, |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
614 counting the definition just completed as the first repetition. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
615 An argument of zero means repeat until error." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
616 (interactive "P") |
88155 | 617 ;; Isearch may push the kmacro-end-macro key sequence onto the macro. |
618 ;; Just ignore it when executing the macro. | |
619 (unless executing-kbd-macro | |
620 (end-kbd-macro arg #'kmacro-loop-setup-function) | |
621 (when (and last-kbd-macro (= (length last-kbd-macro) 0)) | |
622 (message "Ignore empty macro") | |
623 (kmacro-pop-ring)))) | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
624 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
625 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
626 ;;;###autoload |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
627 (defun kmacro-call-macro (arg &optional no-repeat end-macro) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
628 "Call the last keyboard macro that you defined with \\[kmacro-start-macro]. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
629 A prefix argument serves as a repeat count. Zero means repeat until error. |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
630 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
631 When you call the macro, you can call the macro again by repeating |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
632 just the last key in the key sequence that you used to call this |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
633 command. See `kmacro-call-repeat-key' and `kmacro-call-repeat-with-arg' |
88155 | 634 for details on how to adjust or disable this behavior. |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
635 |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
636 To make a macro permanent so you can call it even after defining |
88155 | 637 others, use \\[kmacro-name-last-macro]." |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
638 (interactive "p") |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
639 (let ((repeat-key (and (null no-repeat) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
640 (> (length (this-single-command-keys)) 1) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
641 last-input-event)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
642 repeat-key-str) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
643 (if end-macro |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
644 (kmacro-end-macro arg) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
645 (call-last-kbd-macro arg #'kmacro-loop-setup-function)) |
47361
5e3418a37a64
(kmacro-call-macro): Deal with a non-numeric prefix arg.
Miles Bader <miles@gnu.org>
parents:
47310
diff
changeset
|
646 (when (consp arg) |
5e3418a37a64
(kmacro-call-macro): Deal with a non-numeric prefix arg.
Miles Bader <miles@gnu.org>
parents:
47310
diff
changeset
|
647 (setq arg (car arg))) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
648 (when (and (or (null arg) (> arg 0)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
649 (setq repeat-key |
47361
5e3418a37a64
(kmacro-call-macro): Deal with a non-numeric prefix arg.
Miles Bader <miles@gnu.org>
parents:
47310
diff
changeset
|
650 (if (eq kmacro-call-repeat-key t) |
5e3418a37a64
(kmacro-call-macro): Deal with a non-numeric prefix arg.
Miles Bader <miles@gnu.org>
parents:
47310
diff
changeset
|
651 repeat-key |
5e3418a37a64
(kmacro-call-macro): Deal with a non-numeric prefix arg.
Miles Bader <miles@gnu.org>
parents:
47310
diff
changeset
|
652 kmacro-call-repeat-key))) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
653 (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil)) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
654 (while repeat-key |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
655 (message "(Type %s to repeat macro%s)" |
47388
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
656 repeat-key-str |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
657 (if (and kmacro-call-repeat-with-arg |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
658 arg (> arg 1)) |
47388
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
659 (format " %d times" arg) "")) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
660 (if (equal repeat-key (read-event)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
661 (progn |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
662 (clear-this-command-keys t) |
47361
5e3418a37a64
(kmacro-call-macro): Deal with a non-numeric prefix arg.
Miles Bader <miles@gnu.org>
parents:
47310
diff
changeset
|
663 (call-last-kbd-macro (and kmacro-call-repeat-with-arg arg) |
5e3418a37a64
(kmacro-call-macro): Deal with a non-numeric prefix arg.
Miles Bader <miles@gnu.org>
parents:
47310
diff
changeset
|
664 #'kmacro-loop-setup-function) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
665 (setq last-input-event nil)) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
666 (setq repeat-key nil))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
667 (when last-input-event |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
668 (clear-this-command-keys t) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
669 (setq unread-command-events (list last-input-event)))))) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
670 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
671 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
672 ;;; Combined function key bindings: |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
673 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
674 ;;;###autoload |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
675 (defun kmacro-start-macro-or-insert-counter (arg) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
676 "Record subsequent keyboard input, defining a keyboard macro. |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
677 The commands are recorded even as they are executed. |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
678 |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
679 Sets the `kmacro-counter' to ARG (or 0 if no prefix arg) before defining the |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
680 macro. |
46083 | 681 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
682 With \\[universal-argument], appends to current keyboard macro (keeping |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
683 the current value of `kmacro-counter'). |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
684 |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
685 When defining/executing macro, inserts macro counter and increments |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
686 the counter with ARG or 1 if missing. With \\[universal-argument], |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
687 inserts previous kmacro-counter (but do not modify counter). |
46083 | 688 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
689 The macro counter can be modified via \\[kmacro-set-counter] and \\[kmacro-add-counter]. |
46083 | 690 The format of the counter can be modified via \\[kmacro-set-format]." |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
691 (interactive "P") |
46083 | 692 (if (or defining-kbd-macro executing-kbd-macro) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
693 (kmacro-insert-counter arg) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
694 (kmacro-start-macro arg))) |
46083 | 695 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
696 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
697 ;;;###autoload |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
698 (defun kmacro-end-or-call-macro (arg &optional no-repeat) |
46083 | 699 "End kbd macro if currently being defined; else call last kbd macro. |
46099
d441fc235798
Passed it through checkdoc. Moved `provide' to the end, where it belongs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46085
diff
changeset
|
700 With numeric prefix ARG, repeat macro that many times. |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
701 With \\[universal-argument], call second macro in macro ring." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
702 (interactive "P") |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
703 (cond |
46083 | 704 (defining-kbd-macro |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
705 (if kmacro-call-repeat-key |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
706 (kmacro-call-macro arg no-repeat t) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
707 (kmacro-end-macro arg))) |
88155 | 708 ((and (eq this-command 'kmacro-view-macro) ;; We are in repeat mode! |
709 kmacro-view-last-item) | |
710 (kmacro-exec-ring-item (car kmacro-view-last-item) arg)) | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
711 ((and arg (listp arg)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
712 (kmacro-call-ring-2nd 1)) |
46083 | 713 (t |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
714 (kmacro-call-macro arg no-repeat)))) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
715 |
46083 | 716 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
717 (defun kmacro-end-or-call-macro-repeat (arg) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
718 "As `kmacro-end-or-call-macro' but allows repeat without repeating prefix." |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
719 (interactive "P") |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
720 (let ((keys (kmacro-get-repeat-prefix))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
721 (kmacro-end-or-call-macro arg t) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
722 (if keys |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
723 (kmacro-repeat-on-last-key keys)))) |
46083 | 724 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
725 (put 'kmacro-end-or-call-macro-repeat 'kmacro-repeat 'head) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
726 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
727 |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
728 ;;;###autoload |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
729 (defun kmacro-end-and-call-macro (arg &optional no-repeat) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
730 "Call last keyboard macro, ending it first if currently being defined. |
88155 | 731 With numeric prefix ARG, repeat macro that many times. |
732 Zero argument means repeat until there is an error. | |
733 | |
734 To give a macro a permanent name, so you can call it | |
735 even after defining other macros, use \\[kmacro-name-last-macro]." | |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
736 (interactive "P") |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
737 (if defining-kbd-macro |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
738 (kmacro-end-macro nil)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
739 (kmacro-call-macro arg no-repeat)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
740 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
741 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
742 ;;;###autoload |
46083 | 743 (defun kmacro-end-call-mouse (event) |
744 "Move point to the position clicked with the mouse and call last kbd macro. | |
745 If kbd macro currently being defined end it before activating it." | |
746 (interactive "e") | |
747 (when defining-kbd-macro | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
748 (end-kbd-macro)) |
46083 | 749 (mouse-set-point event) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
750 (kmacro-call-macro nil t)) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
751 |
46083 | 752 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
753 ;;; Misc. commands |
46083 | 754 |
88155 | 755 ;; An idea for macro bindings: |
756 ;; Create a separate keymap installed as a minor-mode keymap (e.g. in | |
757 ;; the emulation-mode-map-alists) in which macro bindings are made | |
758 ;; independent of any other bindings. When first binding is made, | |
759 ;; the kemap is created, installed, and enabled. Key seq. C-x C-k + | |
760 ;; can then be used to toggle the use of this keymap on and off. | |
761 ;; This means that it would be safe(r) to bind ordinary keys like | |
762 ;; letters and digits, provided that we inhibit the keymap while | |
763 ;; executing the macro later on (but that's controversial...) | |
764 | |
765 (defun kmacro-lambda-form (mac &optional counter format) | |
766 "Create lambda form for macro bound to symbol or key." | |
767 (if counter | |
768 (setq mac (list mac counter format))) | |
769 `(lambda (&optional arg) | |
770 "Keyboard macro." | |
771 (interactive "p") | |
772 (kmacro-exec-ring-item ',mac arg))) | |
773 | |
774 (defun kmacro-extract-lambda (mac) | |
775 "Extract kmacro from a kmacro lambda form." | |
776 (and (consp mac) | |
777 (eq (car mac) 'lambda) | |
778 (setq mac (assoc 'kmacro-exec-ring-item mac)) | |
779 (consp (cdr mac)) | |
780 (consp (car (cdr mac))) | |
781 (consp (cdr (car (cdr mac)))) | |
782 (setq mac (car (cdr (car (cdr mac))))) | |
783 (listp mac) | |
784 (= (length mac) 3) | |
785 (arrayp (car mac)) | |
786 mac)) | |
787 | |
788 | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
789 (defun kmacro-bind-to-key (arg) |
88155 | 790 "When not defining or executing a macro, offer to bind last macro to a key. |
791 The key sequences [C-x C-k 0] through [C-x C-k 9] and [C-x C-k A] | |
792 through [C-x C-k Z] are reserved for user bindings, and to bind to | |
793 one of these sequences, just enter the digit or letter, rather than | |
794 the whole sequence. | |
795 | |
796 You can bind to any valid key sequence, but if you try to bind to | |
797 a key with an existing command binding, you will be asked for | |
798 confirmation whether to replace that binding. Note that the | |
799 binding is made in the `global-map' keymap, so the macro binding | |
800 may be shaded by a local key binding." | |
46083 | 801 (interactive "p") |
802 (if (or defining-kbd-macro executing-kbd-macro) | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
803 (if defining-kbd-macro |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
804 (message "Cannot save macro while defining it.")) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
805 (unless last-kbd-macro |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
806 (error "No keyboard macro defined")) |
88155 | 807 (let ((key-seq (read-key-sequence "Bind last macro to key: ")) |
808 ok cmd) | |
809 (when (= (length key-seq) 1) | |
810 (let ((ch (aref key-seq 0))) | |
811 (if (or (and (>= ch ?0) (<= ch ?9)) | |
812 (and (>= ch ?A) (<= ch ?Z))) | |
813 (setq key-seq (concat "\C-x\C-k" key-seq) | |
814 ok t)))) | |
815 (when (and (not (equal key-seq "")) | |
816 (or ok | |
817 (not (setq cmd (key-binding key-seq))) | |
818 (stringp cmd) | |
819 (vectorp cmd) | |
820 (yes-or-no-p (format "%s runs command %S. Bind anyway? " | |
821 (format-kbd-macro key-seq) | |
822 cmd)))) | |
823 (define-key global-map key-seq | |
824 (kmacro-lambda-form (kmacro-ring-head))) | |
825 (message "Keyboard macro bound to %s" (format-kbd-macro key-seq)))))) | |
826 | |
827 | |
828 (defun kmacro-name-last-macro (symbol) | |
829 "Assign a name to the last keyboard macro defined. | |
830 Argument SYMBOL is the name to define. | |
831 The symbol's function definition becomes the keyboard macro string. | |
832 Such a \"function\" cannot be called from Lisp, but it is a valid editor command." | |
833 (interactive "SName for last kbd macro: ") | |
834 (or last-kbd-macro | |
835 (error "No keyboard macro defined")) | |
836 (and (fboundp symbol) | |
837 (not (get symbol 'kmacro)) | |
838 (not (stringp (symbol-function symbol))) | |
839 (not (vectorp (symbol-function symbol))) | |
840 (error "Function %s is already defined and not a keyboard macro" | |
841 symbol)) | |
842 (if (string-equal symbol "") | |
843 (error "No command name given")) | |
844 (fset symbol (kmacro-lambda-form (kmacro-ring-head))) | |
845 (put symbol 'kmacro t)) | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
846 |
46083 | 847 |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
848 (defun kmacro-view-macro (&optional arg) |
88155 | 849 "Display the last keyboard macro. |
850 If repeated, it shows previous elements in the macro ring." | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
851 (interactive) |
88155 | 852 (cond |
853 ((or (kmacro-ring-empty-p) | |
854 (not (eq last-command 'kmacro-view-macro))) | |
855 (setq kmacro-view-last-item nil)) | |
856 ((null kmacro-view-last-item) | |
857 (setq kmacro-view-last-item kmacro-ring | |
858 kmacro-view-item-no 2)) | |
859 ((consp kmacro-view-last-item) | |
860 (setq kmacro-view-last-item (cdr kmacro-view-last-item) | |
861 kmacro-view-item-no (1+ kmacro-view-item-no))) | |
862 (t | |
863 (setq kmacro-view-last-item nil))) | |
864 (setq this-command 'kmacro-view-macro | |
865 last-command this-command) ;; in case we repeat | |
866 (kmacro-display (if kmacro-view-last-item | |
867 (car (car kmacro-view-last-item)) | |
868 last-kbd-macro) | |
869 nil | |
870 (if kmacro-view-last-item | |
871 (concat (cond ((= kmacro-view-item-no 2) "2nd") | |
872 ((= kmacro-view-item-no 3) "3nd") | |
873 (t (format "%dth" kmacro-view-item-no))) | |
874 " previous macro") | |
875 "Last macro"))) | |
46083 | 876 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
877 (defun kmacro-view-macro-repeat (&optional arg) |
88155 | 878 "Display the last keyboard macro. |
879 If repeated, it shows previous elements in the macro ring. | |
880 To execute the displayed macro ring item without changing the macro ring, | |
881 just enter C-k. | |
882 This is like `kmacro-view-macro', but allows repeating macro commands | |
883 without repeating the prefix." | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
884 (interactive) |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
885 (let ((keys (kmacro-get-repeat-prefix))) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
886 (kmacro-view-macro arg) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
887 (if (and last-kbd-macro keys) |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
888 (kmacro-repeat-on-last-key keys)))) |
46083 | 889 |
88155 | 890 (put 'kmacro-view-macro-repeat 'kmacro-repeat 'ring) |
46083 | 891 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
892 |
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
893 (defun kmacro-edit-macro-repeat (&optional arg) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
894 "Edit last keyboard macro." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
895 (interactive "P") |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
896 (edit-kbd-macro "\r" arg)) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
897 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
898 (put 'kmacro-edit-macro-repeat 'kmacro-repeat 'stop) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
899 |
46083 | 900 |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
901 (defun kmacro-edit-macro (&optional arg) |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
902 "As edit last keyboard macro, but without kmacro-repeat property." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
903 (interactive "P") |
47094
cbc107c19e30
Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents:
47051
diff
changeset
|
904 (edit-kbd-macro "\r" arg)) |
46083 | 905 |
906 | |
46961
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
907 (defun kmacro-edit-lossage () |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
908 "Edit most recent 100 keystrokes as a keyboard macro." |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
909 (interactive) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
910 (kmacro-push-ring) |
7e8358ec31ba
Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents:
46099
diff
changeset
|
911 (edit-kbd-macro "\C-hl")) |
46083 | 912 |
913 | |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
914 ;;; Single-step editing of keyboard macros |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
915 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
916 (defvar kmacro-step-edit-active) ;; step-editing active |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
917 (defvar kmacro-step-edit-new-macro) ;; storage for new macro |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
918 (defvar kmacro-step-edit-inserting) ;; inserting into macro |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
919 (defvar kmacro-step-edit-appending) ;; append to end of macro |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
920 (defvar kmacro-step-edit-replace) ;; replace orig macro when done |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
921 (defvar kmacro-step-edit-prefix-index) ;; index of first prefix arg key |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
922 (defvar kmacro-step-edit-key-index) ;; index of current key |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
923 (defvar kmacro-step-edit-action) ;; automatic action on next pre-command hook |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
924 (defvar kmacro-step-edit-help) ;; kmacro step edit help enabled |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
925 (defvar kmacro-step-edit-num-input-keys) ;; to ignore duplicate pre-command hook |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
926 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
927 (defvar kmacro-step-edit-map (make-sparse-keymap) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
928 "Keymap that defines the responses to questions in `kmacro-step-edit-macro'. |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
929 This keymap is an extension to the `query-replace-map', allowing the |
47388
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
930 following additional answers: `insert', `insert-1', `replace', `replace-1', |
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
931 `append', `append-end', `act-repeat', `skip-end', `skip-keep'.") |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
932 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
933 ;; query-replace-map answers include: `act', `skip', `act-and-show', |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
934 ;; `exit', `act-and-exit', `edit', `delete-and-edit', `recenter', |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
935 ;; `automatic', `backup', `exit-prefix', and `help'.") |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
936 ;; Also: `quit', `edit-replacement' |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
937 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
938 (set-keymap-parent kmacro-step-edit-map query-replace-map) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
939 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
940 (define-key kmacro-step-edit-map "\t" 'act-repeat) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
941 (define-key kmacro-step-edit-map [tab] 'act-repeat) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
942 (define-key kmacro-step-edit-map "\C-k" 'skip-rest) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
943 (define-key kmacro-step-edit-map "c" 'automatic) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
944 (define-key kmacro-step-edit-map "f" 'skip-keep) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
945 (define-key kmacro-step-edit-map "q" 'quit) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
946 (define-key kmacro-step-edit-map "d" 'skip) |
47565
a02c3a1fc1ab
(kmacro-step-edit-query): Use RET to execute rest of
Kim F. Storm <storm@cua.dk>
parents:
47457
diff
changeset
|
947 (define-key kmacro-step-edit-map "\C-d" 'skip) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
948 (define-key kmacro-step-edit-map "i" 'insert) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
949 (define-key kmacro-step-edit-map "I" 'insert-1) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
950 (define-key kmacro-step-edit-map "r" 'replace) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
951 (define-key kmacro-step-edit-map "R" 'replace-1) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
952 (define-key kmacro-step-edit-map "a" 'append) |
47388
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
953 (define-key kmacro-step-edit-map "A" 'append-end) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
954 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
955 (defvar kmacro-step-edit-prefix-commands |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
956 '(universal-argument universal-argument-more universal-argument-minus |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
957 digit-argument negative-argument) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
958 "Commands which builds up a prefix arg for the current command") |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
959 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
960 (defun kmacro-step-edit-prompt (macro index) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
961 ;; Show step-edit prompt |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
962 (let ((keys (and (not kmacro-step-edit-appending) |
88155 | 963 index (substring macro index executing-kbd-macro-index))) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
964 (future (and (not kmacro-step-edit-appending) |
88155 | 965 (substring macro executing-kbd-macro-index))) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
966 (message-log-max nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
967 (curmsg (current-message))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
968 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
969 ;; TODO: Scroll macro if max-mini-window-height is too small. |
88155 | 970 (message "%s" |
971 (concat | |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
972 (format "Macro: %s%s%s%s%s\n" |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
973 (format-kbd-macro kmacro-step-edit-new-macro 1) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
974 (if (and kmacro-step-edit-new-macro (> (length kmacro-step-edit-new-macro) 0)) " " "") |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
975 (propertize (if keys (format-kbd-macro keys) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
976 (if kmacro-step-edit-appending "<APPEND>" "<INSERT>")) 'face 'region) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
977 (if future " " "") |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
978 (if future (format-kbd-macro future) "")) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
979 (cond |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
980 ((minibufferp) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
981 (format "%s\n%s\n" |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
982 (propertize "\ |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
983 minibuffer " 'face 'header-line) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
984 (buffer-substring (point-min) (point-max)))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
985 (curmsg |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
986 (format "%s\n%s\n" |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
987 (propertize "\ |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
988 echo area " 'face 'header-line) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
989 curmsg)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
990 (t "")) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
991 (if keys |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
992 (format "%s\n%s%s %S [yn iIaArR C-k kq!] " |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
993 (propertize "\ |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
994 --------------Step Edit Keyboard Macro [?: help]---------------" 'face 'mode-line) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
995 (if kmacro-step-edit-help "\ |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
996 Step: y/SPC: execute next, d/n/DEL: skip next, f: skip but keep |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
997 TAB: execute while same, ?: toggle help |
47389 | 998 Edit: i: insert, r: replace, a: append, A: append at end, |
999 I/R: insert/replace with one sequence, | |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1000 End: !/c: execute rest, C-k: skip rest and save, q/C-g: quit |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1001 ---------------------------------------------------------------- |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1002 " "") |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1003 (propertize "Next command:" 'face 'bold) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1004 this-command) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
1005 (propertize |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1006 (format "Type key sequence%s to insert and execute%s: " |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1007 (if (numberp kmacro-step-edit-inserting) "" "s") |
47388
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1008 (if (numberp kmacro-step-edit-inserting) "" " (end with C-j)")) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1009 'face 'bold)))))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1010 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1011 (defun kmacro-step-edit-query () |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1012 ;; Pre-command hook function for step-edit in "command" mode |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1013 (let ((resize-mini-windows t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1014 (max-mini-window-height kmacro-step-edit-mini-window-height) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1015 act restore-index next-index) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1016 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1017 ;; Handle commands which reads additional input using read-char. |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1018 (cond |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1019 ((and (eq this-command 'quoted-insert) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1020 (not (eq kmacro-step-edit-action t))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1021 ;; Find the actual end of this key sequence. |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1022 ;; Must be able to backtrack in case we actually execute it. |
88155 | 1023 (setq restore-index executing-kbd-macro-index) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1024 (let (unread-command-events) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1025 (quoted-insert 0) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1026 (when unread-command-events |
88155 | 1027 (setq executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events)) |
1028 next-index executing-kbd-macro-index))))) | |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1029 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1030 ;; Query the user; stop macro exection temporarily |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1031 (let ((macro executing-kbd-macro) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1032 (executing-kbd-macro nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1033 (defining-kbd-macro nil)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1034 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1035 ;; Any action requested by previous command |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1036 (cond |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1037 ((eq kmacro-step-edit-action t) ;; Reentry for actual command @ end of prefix arg. |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1038 (cond |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1039 ((eq this-command 'quoted-insert) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1040 (clear-this-command-keys) ;; recent-keys actually |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1041 (let (unread-command-events) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1042 (quoted-insert (prefix-numeric-value current-prefix-arg)) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
1043 (setq kmacro-step-edit-new-macro |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1044 (vconcat kmacro-step-edit-new-macro (recent-keys))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1045 (when unread-command-events |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1046 (setq kmacro-step-edit-new-macro |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1047 (substring kmacro-step-edit-new-macro 0 (- (length unread-command-events))) |
88155 | 1048 executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events))))) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1049 (setq current-prefix-arg nil |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1050 prefix-arg nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1051 (setq act 'ignore)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1052 (t |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1053 (setq act 'act))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1054 (setq kmacro-step-edit-action nil)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1055 ((eq this-command kmacro-step-edit-action) ;; TAB -> activate while same command |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1056 (setq act 'act)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1057 (t |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1058 (setq kmacro-step-edit-action nil))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1059 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1060 ;; Handle prefix arg, or query user |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1061 (cond |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1062 (act act) ;; set above |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1063 ((memq this-command kmacro-step-edit-prefix-commands) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1064 (unless kmacro-step-edit-prefix-index |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1065 (setq kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1066 (setq act 'universal-argument)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1067 ((eq this-command 'universal-argument-other-key) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1068 (setq act 'universal-argument)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1069 (t |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1070 (kmacro-step-edit-prompt macro (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1071 (setq act (lookup-key kmacro-step-edit-map |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1072 (vector (with-current-buffer (current-buffer) (read-event)))))))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1073 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1074 ;; Resume macro execution and perform the action |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1075 (cond |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1076 ((eq act 'universal-argument) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1077 nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1078 ((cond |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1079 ((eq act 'act) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1080 t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1081 ((eq act 'act-repeat) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1082 (setq kmacro-step-edit-action this-command) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1083 t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1084 ((eq act 'quit) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1085 (setq kmacro-step-edit-replace nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1086 (setq kmacro-step-edit-active 'ignore) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1087 nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1088 ((eq act 'skip) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1089 (setq kmacro-step-edit-prefix-index nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1090 nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1091 ((eq act 'skip-keep) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1092 (setq this-command 'ignore) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1093 t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1094 ((eq act 'skip-rest) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1095 (setq kmacro-step-edit-active 'ignore) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1096 nil) |
47565
a02c3a1fc1ab
(kmacro-step-edit-query): Use RET to execute rest of
Kim F. Storm <storm@cua.dk>
parents:
47457
diff
changeset
|
1097 ((memq act '(automatic exit)) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1098 (setq kmacro-step-edit-active nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1099 (setq act t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1100 t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1101 ((member act '(insert-1 insert)) |
88155 | 1102 (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1103 (setq kmacro-step-edit-inserting (if (eq act 'insert-1) 1 t)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1104 nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1105 ((member act '(replace-1 replace)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1106 (setq kmacro-step-edit-inserting (if (eq act 'replace-1) 1 t)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1107 (setq kmacro-step-edit-prefix-index nil) |
88155 | 1108 (if (= executing-kbd-macro-index (length executing-kbd-macro)) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1109 (setq executing-kbd-macro (vconcat executing-kbd-macro [nil]) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1110 kmacro-step-edit-appending t)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1111 nil) |
47388
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1112 ((eq act 'append) |
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1113 (setq kmacro-step-edit-inserting t) |
88155 | 1114 (if (= executing-kbd-macro-index (length executing-kbd-macro)) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1115 (setq executing-kbd-macro (vconcat executing-kbd-macro [nil]) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1116 kmacro-step-edit-appending t)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1117 t) |
47388
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1118 ((eq act 'append-end) |
88155 | 1119 (if (= executing-kbd-macro-index (length executing-kbd-macro)) |
47388
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1120 (setq executing-kbd-macro (vconcat executing-kbd-macro [nil]) |
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1121 kmacro-step-edit-inserting t |
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1122 kmacro-step-edit-appending t) |
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1123 (setq kmacro-step-edit-active 'append-end)) |
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1124 (setq act t) |
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1125 t) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1126 ((eq act 'help) |
88155 | 1127 (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1128 (setq kmacro-step-edit-help (not kmacro-step-edit-help)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1129 nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1130 (t ;; Ignore unknown responses |
88155 | 1131 (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1132 nil)) |
88155 | 1133 (if (> executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1134 (setq kmacro-step-edit-new-macro |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1135 (vconcat kmacro-step-edit-new-macro |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47565
diff
changeset
|
1136 (substring executing-kbd-macro |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1137 (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index) |
88155 | 1138 (if (eq act t) nil executing-kbd-macro-index))) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1139 kmacro-step-edit-prefix-index nil)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1140 (if restore-index |
88155 | 1141 (setq executing-kbd-macro-index restore-index))) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1142 (t |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1143 (setq this-command 'ignore))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1144 (setq kmacro-step-edit-key-index next-index))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1145 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1146 (defun kmacro-step-edit-insert () |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1147 ;; Pre-command hook function for step-edit in "insert" mode |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1148 (let ((resize-mini-windows t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1149 (max-mini-window-height kmacro-step-edit-mini-window-height) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1150 (macro executing-kbd-macro) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1151 (executing-kbd-macro nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1152 (defining-kbd-macro nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1153 cmd keys next-index) |
88155 | 1154 (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1155 kmacro-step-edit-prefix-index nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1156 (kmacro-step-edit-prompt macro nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1157 ;; Now, we have read a key sequence from the macro, but we don't want |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1158 ;; to execute it yet. So push it back and read another sequence. |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1159 (reset-this-command-lengths) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1160 (setq keys (read-key-sequence nil nil nil nil t)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1161 (setq cmd (key-binding keys t nil)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1162 (if (cond |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1163 ((null cmd) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1164 t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1165 ((eq cmd 'quoted-insert) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1166 (clear-this-command-keys) ;; recent-keys actually |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1167 (quoted-insert (prefix-numeric-value current-prefix-arg)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1168 (setq current-prefix-arg nil |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1169 prefix-arg nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1170 (setq keys (vconcat keys (recent-keys))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1171 (when (numberp kmacro-step-edit-inserting) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1172 (setq kmacro-step-edit-inserting nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1173 (when unread-command-events |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1174 (setq keys (substring keys 0 (- (length unread-command-events))) |
88155 | 1175 executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events)) |
1176 next-index executing-kbd-macro-index | |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1177 unread-command-events nil))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1178 (setq cmd 'ignore) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1179 nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1180 ((memq cmd kmacro-step-edit-prefix-commands) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1181 (setq universal-argument-num-events 0) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1182 (reset-this-command-lengths) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1183 nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1184 ((eq cmd 'universal-argument-other-key) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1185 (setq kmacro-step-edit-action t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1186 (setq universal-argument-num-events 0) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1187 (reset-this-command-lengths) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1188 (if (numberp kmacro-step-edit-inserting) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1189 (setq kmacro-step-edit-inserting nil)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1190 nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1191 ((numberp kmacro-step-edit-inserting) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1192 (setq kmacro-step-edit-inserting nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1193 nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1194 ((equal keys "\C-j") |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1195 (setq kmacro-step-edit-inserting nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1196 (setq kmacro-step-edit-action nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1197 ;; Forget any (partial) prefix arg from next command |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1198 (setq kmacro-step-edit-prefix-index nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1199 (reset-this-command-lengths) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1200 (setq overriding-terminal-local-map nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1201 (setq universal-argument-num-events nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1202 (setq next-index kmacro-step-edit-key-index) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1203 t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1204 (t nil)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1205 (setq this-command 'ignore) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1206 (setq this-command cmd) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1207 (if (memq this-command '(self-insert-command digit-argument)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1208 (setq last-command-char (aref keys (1- (length keys))))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1209 (if keys |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1210 (setq kmacro-step-edit-new-macro (vconcat kmacro-step-edit-new-macro keys)))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1211 (setq kmacro-step-edit-key-index next-index))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1212 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1213 (defun kmacro-step-edit-pre-command () |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1214 (remove-hook 'post-command-hook 'kmacro-step-edit-post-command) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1215 (when kmacro-step-edit-active |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1216 (cond |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1217 ((eq kmacro-step-edit-active 'ignore) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1218 (setq this-command 'ignore)) |
47388
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1219 ((eq kmacro-step-edit-active 'append-end) |
88155 | 1220 (if (= executing-kbd-macro-index (length executing-kbd-macro)) |
47388
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1221 (setq executing-kbd-macro (vconcat executing-kbd-macro [nil]) |
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1222 kmacro-step-edit-inserting t |
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1223 kmacro-step-edit-appending t |
56bcf85aafae
(kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents:
47361
diff
changeset
|
1224 kmacro-step-edit-active t))) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1225 ((/= kmacro-step-edit-num-input-keys num-input-keys) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1226 (if kmacro-step-edit-inserting |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1227 (kmacro-step-edit-insert) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1228 (kmacro-step-edit-query)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1229 (setq kmacro-step-edit-num-input-keys num-input-keys) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1230 (if (and kmacro-step-edit-appending (not kmacro-step-edit-inserting)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1231 (setq kmacro-step-edit-appending nil |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1232 kmacro-step-edit-active 'ignore))))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1233 (when (eq kmacro-step-edit-active t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1234 (add-hook 'post-command-hook 'kmacro-step-edit-post-command t))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1235 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1236 (defun kmacro-step-edit-minibuf-setup () |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1237 (remove-hook 'pre-command-hook 'kmacro-step-edit-pre-command t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1238 (when kmacro-step-edit-active |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1239 (add-hook 'pre-command-hook 'kmacro-step-edit-pre-command nil t))) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1240 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1241 (defun kmacro-step-edit-post-command () |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1242 (remove-hook 'pre-command-hook 'kmacro-step-edit-pre-command) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1243 (when kmacro-step-edit-active |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1244 (add-hook 'pre-command-hook 'kmacro-step-edit-pre-command nil nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1245 (if kmacro-step-edit-key-index |
88155 | 1246 (setq executing-kbd-macro-index kmacro-step-edit-key-index) |
1247 (setq kmacro-step-edit-key-index executing-kbd-macro-index)))) | |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1248 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1249 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1250 (defun kmacro-step-edit-macro () |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1251 "Step edit and execute last keyboard macro. |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1252 |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1253 To customize possible responses, change the \"bindings\" in `kmacro-step-edit-map'." |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1254 (interactive) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1255 (let ((kmacro-step-edit-active t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1256 (kmacro-step-edit-new-macro "") |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1257 (kmacro-step-edit-inserting nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1258 (kmacro-step-edit-appending nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1259 (kmacro-step-edit-replace t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1260 (kmacro-step-edit-prefix-index nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1261 (kmacro-step-edit-key-index 0) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1262 (kmacro-step-edit-action nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1263 (kmacro-step-edit-help nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1264 (kmacro-step-edit-num-input-keys num-input-keys) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1265 (pre-command-hook pre-command-hook) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1266 (post-command-hook post-command-hook) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1267 (minibuffer-setup-hook minibuffer-setup-hook)) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1268 (add-hook 'pre-command-hook 'kmacro-step-edit-pre-command nil) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1269 (add-hook 'post-command-hook 'kmacro-step-edit-post-command t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1270 (add-hook 'minibuffer-setup-hook 'kmacro-step-edit-minibuf-setup t) |
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1271 (call-last-kbd-macro nil nil) |
47565
a02c3a1fc1ab
(kmacro-step-edit-query): Use RET to execute rest of
Kim F. Storm <storm@cua.dk>
parents:
47457
diff
changeset
|
1272 (when (and kmacro-step-edit-replace |
a02c3a1fc1ab
(kmacro-step-edit-query): Use RET to execute rest of
Kim F. Storm <storm@cua.dk>
parents:
47457
diff
changeset
|
1273 kmacro-step-edit-new-macro |
a02c3a1fc1ab
(kmacro-step-edit-query): Use RET to execute rest of
Kim F. Storm <storm@cua.dk>
parents:
47457
diff
changeset
|
1274 (not (equal last-kbd-macro kmacro-step-edit-new-macro))) |
a02c3a1fc1ab
(kmacro-step-edit-query): Use RET to execute rest of
Kim F. Storm <storm@cua.dk>
parents:
47457
diff
changeset
|
1275 (kmacro-push-ring) |
a02c3a1fc1ab
(kmacro-step-edit-query): Use RET to execute rest of
Kim F. Storm <storm@cua.dk>
parents:
47457
diff
changeset
|
1276 (setq last-kbd-macro kmacro-step-edit-new-macro)))) |
47310
5a8754f590f4
(kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents:
47094
diff
changeset
|
1277 |
46099
d441fc235798
Passed it through checkdoc. Moved `provide' to the end, where it belongs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46085
diff
changeset
|
1278 (provide 'kmacro) |
88155 | 1279 |
1280 ;;; arch-tag: d3fe0b24-ae41-47de-a4d6-41a77d5559f0 | |
46099
d441fc235798
Passed it through checkdoc. Moved `provide' to the end, where it belongs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46085
diff
changeset
|
1281 ;;; kmacro.el ends here |