annotate lisp/kmacro.el @ 52325:5206a4b09125

(ibuffer-formats): Make name and size columns wider.
author John Paul Wallington <jpw@pobox.com>
date Sun, 24 Aug 2003 18:09:07 +0000
parents d37e0b4125e8
children 695cf19ef79e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1 ;;; kmacro.el --- enhanced keyboard macros
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2
46085
33538dc6ac79 Fixed copyright and keywords.
Kim F. Storm <storm@cua.dk>
parents: 46083
diff changeset
3 ;; Copyright (C) 2002 Free Software Foundation, Inc.
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
9
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
13 ;; any later version.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
14
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
18 ;; GNU General Public License for more details.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
19
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
23 ;; Boston, MA 02111-1307, USA.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
24
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
25 ;;; Commentary:
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
26
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
27 ;; The kmacro package is an alternative user interface to emacs'
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
30 ;; type to be really useful for doing small repeated tasks.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
31
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
34 ;; keys already have default bindings.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
38 ;; easy to repeat a macro immediately after defining it.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
41 ;; you can give a numeric prefix argument specifying the number of
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
42 ;; times to repeat the macro. Macro execution automatically
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
43 ;; terminates when point reaches the end of the buffer or if an error
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
44 ;; is signalled by ringing the bell.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
70 ;; `kmacro-counter' is inserted using the `kmacro-counter-format', and
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
73 ;;
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
78 ;; value of `kmacro-counter' is inserted and incremented, making it
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
79 ;; easy to insert incremental numbers in the buffer.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
80 ;;
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
81 ;; Example:
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
84 ;; inserts the following string: x5yx7yx9yx11y
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
87 ;; This calls the macro at the point where you click the mouse.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
95
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
96 ;; The following key bindings are performed:
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
97 ;;
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
98 ;; Normal While defining macro
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
101 ;; Prefix arg specifies initial and increase counter by prefix
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
102 ;; counter value (default 0) (default increment: 1)
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
107 ;; Prefix arg specifies number
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
108 ;; of times to execute macro.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
112 ;; S-mouse-3 Set point at click and End macro and execute macro at
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
113 ;; execute last macro. click.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
114
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
115 ;;; Code:
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
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
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
118
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
119 (defgroup kmacro nil
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
120 "Simplified keyboard macro user interface."
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
121 :group 'keyboard
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
122 :group 'convenience
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
123 :link '(emacs-commentary-link :tag "Commentary" "kmacro.el")
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
124 :link '(emacs-library-link :tag "Lisp File" "kmacro.el"))
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
125
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
126 (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
127 "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
128 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
129 :type 'symbol
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
130 :group 'kmacro)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
131
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
132 (defcustom kmacro-ring-max 8
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
133 "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
134 :type 'integer
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
135 :group 'kmacro)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
136
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 (defcustom kmacro-execute-before-append t
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
139 "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
140 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
141 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
142 execute the macro.
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
143 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
144 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
145 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
146 :type 'boolean
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
147 :group 'kmacro)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
148
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 (defcustom kmacro-repeat-no-prefix t
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
151 "Allow repeating certain macro commands without entering the C-x C-k prefix."
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
152 :type 'boolean
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
153 :group 'kmacro)
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
154
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
155 (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
156 "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
157 :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
158 (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
159 (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
160 (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
161 :group 'kmacro)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
162
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
163 (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
164 "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
165 :type 'boolean
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
166 :group 'kmacro)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
167
47310
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
168 (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
169 "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
170 :type 'number
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
171 :group 'kmacro)
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
172
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
173 ;; Keymap
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
174
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
175 (defvar kmacro-keymap
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
176 (let ((map (make-sparse-keymap)))
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
177 ;; Start, end, execute macros
47448
3a43982413a6 (kmacro-keymap): Changed bindings:
Kim F. Storm <storm@cua.dk>
parents: 47389
diff changeset
178 (define-key map "s" 'kmacro-start-macro)
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
179 (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
180 (define-key map "\C-k" 'kmacro-end-or-call-macro-repeat)
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
181 (define-key map "r" 'apply-macro-to-region-lines)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
182 (define-key map "q" 'kbd-macro-query) ;; Like C-x q
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
183
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
184 ;; macro ring
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
185 (define-key map "\C-n" 'kmacro-cycle-ring-next)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
186 (define-key map "\C-p" 'kmacro-cycle-ring-previous)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
187 (define-key map "\C-v" 'kmacro-view-macro-repeat)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
188 (define-key map "\C-d" 'kmacro-delete-ring-head)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
189 (define-key map "\C-t" 'kmacro-swap-ring)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
190 (define-key map "\C-l" 'kmacro-call-ring-2nd-repeat)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
191
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
192 ;; macro counter
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
193 (define-key map "\C-f" 'kmacro-set-format)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
194 (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
195 (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
196 (define-key map "\C-a" 'kmacro-add-counter)
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
197
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
198 ;; macro editing
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
199 (define-key map "\C-e" 'kmacro-edit-macro-repeat)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
200 (define-key map "\r" 'kmacro-edit-macro)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
201 (define-key map "e" 'edit-kbd-macro)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
202 (define-key map "l" 'kmacro-edit-lossage)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
203 (define-key map " " 'kmacro-step-edit-macro)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
204
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
205 ;; naming and binding
47448
3a43982413a6 (kmacro-keymap): Changed bindings:
Kim F. Storm <storm@cua.dk>
parents: 47389
diff changeset
206 (define-key map "b" 'kmacro-bind-to-key)
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
207 (define-key map "n" 'name-last-kbd-macro)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
208 map)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
209 "Keymap for keyboard macro commands.")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
210 (defalias 'kmacro-keymap kmacro-keymap)
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
211
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
212 ;;; Provide some binding for startup:
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
213 ;;;###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
214 ;;;###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
215 ;;;###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
216 ;;;###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
217 ;;;###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
218 ;;;###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
219 ;;;###autoload (autoload 'kmacro-keymap "kmacro" "Keymap for keyboard macro commands." t 'keymap)
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
220
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
221 (if kmacro-call-mouse-event
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
222 (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
223
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
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
226 ;;; Keyboard macro counter
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
227
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
228 (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
229 "*Current keyboard macro counter.")
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
230
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
231 (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
232 "*Current keyboard macro counter format.")
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
233
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
234 (defvar kmacro-counter-format-start kmacro-counter-format
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
235 "Macro format at start of macro execution.")
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
236
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
237 (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
238 "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
239
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
240 (defvar kmacro-last-counter 0
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
241 "Last counter inserted by key macro.")
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
242
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
243 (defvar kmacro-initial-counter-value nil
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
244 "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
245
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
246
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
247 (defun kmacro-insert-counter (arg)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
248 "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
249 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
250 (interactive "P")
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
251 (setq kmacro-initial-counter-value nil)
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
252 (if (and arg (listp arg))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
253 (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
254 (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
255 (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
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-set-format (format)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
259 "Set macro counter FORMAT."
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
260 (interactive "sMacro Counter Format (printf format): ")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
261 (setq kmacro-counter-format
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
262 (if (equal format "") "%d" format))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
263 ;; 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
264 (if (not (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
265 (setq kmacro-counter-format-start kmacro-counter-format)))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
266
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
267
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
268 (defun kmacro-display-counter (&optional value)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
269 "Display current counter value."
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
270 (unless value (setq value kmacro-counter))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
271 (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
272
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
273
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
274 (defun kmacro-set-counter (arg)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
275 "Set kmacro-counter to ARG or prompt if missing.
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
276 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
277 (interactive "NMacro counter value: ")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
278 (setq kmacro-last-counter kmacro-counter
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
279 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
280 kmacro-counter-value-start
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
281 arg))
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
282 ;; setup initial macro counter value if we are not executing a macro.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
283 (setq kmacro-initial-counter-value
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
284 (and (not (or defining-kbd-macro executing-kbd-macro))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
285 kmacro-counter))
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
286 (unless executing-kbd-macro
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
287 (kmacro-display-counter)))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
288
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
289
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
290 (defun kmacro-add-counter (arg)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
291 "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
292 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
293 (interactive "NAdd to macro counter: ")
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
294 (setq kmacro-initial-counter-value nil)
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
295 (let ((last kmacro-last-counter))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
296 (setq kmacro-last-counter kmacro-counter
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
297 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
298 last
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
299 kmacro-counter (+ kmacro-counter arg))))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
300 (unless executing-kbd-macro
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
301 (kmacro-display-counter)))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
302
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
303
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
304 (defun kmacro-loop-setup-function ()
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
305 "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
306 ;; 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
307 ;; 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
308 (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
309 ;; 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
310 (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
311 ;; Return non-nil to continue execution.
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
312 t)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
313
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
314
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
315 ;;; Keyboard macro ring
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 (defvar kmacro-ring nil
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
318 "The keyboard macro ring.
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
319 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
320 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
321 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
322 and `kmacro-counter-format'.")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
323
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
324 ;; Remember what we are currently looking at with kmacro-view-macro.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
325
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
326 (defvar kmacro-view-last-item nil)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
327 (defvar kmacro-view-item-no 0)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
328
46961
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 (defun kmacro-ring-head ()
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
331 "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
332 (and last-kbd-macro
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
333 (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
334
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
335
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
336 (defun kmacro-push-ring (&optional elt)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
337 "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
338 (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
339 (let ((len (length kmacro-ring)))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
340 (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
341 (if (>= len kmacro-ring-max)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
342 (setcdr (nthcdr len kmacro-ring) nil)))))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
343
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
344
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
345 (defun kmacro-split-ring-element (elt)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
346 (setq last-kbd-macro (car elt)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
347 kmacro-counter (nth 1 elt)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
348 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
349
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
350
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
351 (defun kmacro-pop-ring1 (&optional raw)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
352 "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
353 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
354 (prog1 (car kmacro-ring)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
355 (unless raw
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
356 (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
357 (setq kmacro-ring (cdr kmacro-ring))))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
358
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
359
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
360 (defun kmacro-pop-ring (&optional raw)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
361 "Pop head element off macro ring.
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
362 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
363 (unless (kmacro-ring-empty-p)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
364 (kmacro-pop-ring1 raw)))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
365
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
366
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
367 (defun kmacro-ring-length ()
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
368 "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
369 (+ (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
370
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 (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
373 "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
374 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
375 (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
376 (kmacro-pop-ring1))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
377 (cond
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
378 ((null last-kbd-macro)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
379 (message "No keyboard macro defined.")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
380 t)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
381 ((and (null none) (null kmacro-ring))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
382 (message "Only one keyboard macro defined.")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
383 t)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
384 (t nil)))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
385
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
386
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
387 (defun kmacro-display (macro &optional trunc descr empty)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
388 "Display a keyboard MACRO.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
389 Optional arg TRUNC non-nil specifies to limit width of macro to 60 chars.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
390 Optional arg DESCR is descriptive text for macro; default is \"Macro:\".
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
391 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
392 (if macro
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
393 (let* ((x 60)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
394 (m (format-kbd-macro macro))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
395 (l (length m))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
396 (z (and nil trunc (> l x))))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
397 (message (format "%s: %s%s" (or descr "Macro")
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
398 (if z (substring m 0 (1- x)) m) (if z "..." ""))))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
399 (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
400
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
401
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
402 (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
403 "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
404 (setq keys (vconcat keys))
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
405 (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
406 cmd done repeat)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
407 (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
408 (not done)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
409 (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
410 (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
411 (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
412 (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
413 (cond
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
414 ((eq repeat 'ring)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
415 (if kmacro-ring
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
416 (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
417 (funcall cmd nil))
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
418 (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
419 ((eq repeat 'head)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
420 (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
421 (funcall cmd nil)))
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
422 ((eq repeat 'stop)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
423 (funcall cmd nil)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
424 (setq done t)))
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
425 (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
426 (when last-input-event
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
427 (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
428 (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
429
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
430
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
431 (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
432 (let (keys)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
433 (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
434 (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
435 (> (length keys) 1)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
436 keys)))
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
437
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
438
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
439 (defun kmacro-exec-ring-item (item arg)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
440 "Execute item ITEM from the macro ring."
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
441 ;; Use counter and format specific to the macro on the ring!
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
442 (let ((kmacro-counter (nth 1 item))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
443 (kmacro-counter-format-start (nth 2 item)))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
444 (execute-kbd-macro (car item) arg #'kmacro-loop-setup-function)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
445 (setcar (cdr item) kmacro-counter)))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
446
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
447
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
448 (defun kmacro-call-ring-2nd (arg)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
449 "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
450 (interactive "P")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
451 (unless (kmacro-ring-empty-p)
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
452 (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
453
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
454
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
455 (defun kmacro-call-ring-2nd-repeat (arg)
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
456 "Execute second keyboard macro at in macro ring.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
457 This is like `kmacro-call-ring-2nd', but allows repeating macro commands
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
458 without repeating the prefix."
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
459 (interactive "P")
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
460 (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
461 (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
462 (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
463 (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
464
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
465 (put 'kmacro-call-ring-2nd-repeat 'kmacro-repeat 'head)
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
466
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
467
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
468 (defun kmacro-view-ring-2nd ()
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
469 "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
470 (interactive)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
471 (unless (kmacro-ring-empty-p)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
472 (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
473
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
474
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
475 (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
476 "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
477 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
478 (interactive)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
479 (unless (kmacro-ring-empty-p)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
480 (kmacro-push-ring)
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
481 (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
482 (len (length kmacro-ring))
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
483 (tail (nthcdr (- len 2) kmacro-ring))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
484 (elt (car (cdr tail))))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
485 (setcdr tail nil)
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
486 (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
487 (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
488 (if keys
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
489 (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
490
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
491 (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
492
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
493
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
494 (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
495 "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
496 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
497 (interactive)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
498 (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
499 (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
500 (cur (kmacro-ring-head)))
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
501 (kmacro-pop-ring1)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
502 (if kmacro-ring
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
503 (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
504 (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
505 (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
506 (if keys
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
507 (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
508
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
509 (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
510
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
511
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
512 (defun kmacro-swap-ring ()
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
513 "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
514 (interactive)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
515 (unless (kmacro-ring-empty-p)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
516 (let ((cur (kmacro-ring-head)))
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 (kmacro-push-ring cur))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
519 (kmacro-display last-kbd-macro t)))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
520
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
521
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
522 (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
523 "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
524 (interactive)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
525 (unless (kmacro-ring-empty-p t)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
526 (if (null kmacro-ring)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
527 (setq last-kbd-macro nil)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
528 (kmacro-pop-ring))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
529 (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
530
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
531 (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
532
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
533 ;;; Traditional bindings:
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
534
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
535
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
536 ;;;###autoload
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
537 (defun kmacro-start-macro (arg)
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
538 "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
539 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
540 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
541 Use \\[kmacro-end-and-call-macro] to execute the macro.
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
542 Use \\[name-last-kbd-macro] to give it a permanent name.
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
543 Non-nil arg (prefix arg) means append to last macro defined;
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
544
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
545 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
546 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
547 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
548
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
549 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
550 defining the macro.
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
551
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
552 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
553 The counter value can be set or modified via \\[kmacro-set-counter] and \\[kmacro-add-counter].
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
554 The format of the counter can be modified via \\[kmacro-set-format]."
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
555 (interactive "P")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
556 (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
557 (message "Already defining keyboard macro.")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
558 (let ((append (and arg (listp arg))))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
559 (unless append
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
560 (if last-kbd-macro
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
561 (let ((len (length kmacro-ring)))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
562 (setq kmacro-ring
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
563 (cons
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
564 (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
565 kmacro-ring))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
566 (if (>= len kmacro-ring-max)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
567 (setcdr (nthcdr len kmacro-ring) nil))))
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
568 (setq kmacro-counter (or (if arg (prefix-numeric-value arg))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
569 kmacro-initial-counter-value
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
570 0)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
571 kmacro-initial-counter-value nil
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
572 kmacro-counter-value-start kmacro-counter
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
573 kmacro-last-counter kmacro-counter
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
574 kmacro-counter-format-start kmacro-counter-format))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
575
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
576 (start-kbd-macro append
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
577 (and append
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
578 (if kmacro-execute-before-append
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
579 (> (car arg) 4)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
580 (= (car arg) 4)))))))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
581
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
582
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
583 ;;;###autoload
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
584 (defun kmacro-end-macro (arg)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
585 "Finish defining a keyboard macro.
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
586 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
587 The macro is now available for use via \\[kmacro-call-macro],
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
588 or it can be given a name with \\[name-last-kbd-macro] and then invoked
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
589 under that name.
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
590
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
591 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
592 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
593 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
594 (interactive "P")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
595 (end-kbd-macro arg #'kmacro-loop-setup-function)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
596 (when (and last-kbd-macro (= (length last-kbd-macro) 0))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
597 (message "Ignore empty macro")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
598 (kmacro-pop-ring)))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
599
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
600
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
601 ;;;###autoload
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
602 (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
603 "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
604 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
605
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
606 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
607 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
608 command. See `kmacro-call-repeat-key' 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
609 for details on how to adjust or disable this behaviour.
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
610
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
611 To make a macro permanent so you can call it even after defining
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
612 others, use M-x name-last-kbd-macro."
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
613 (interactive "p")
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
614 (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
615 (> (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
616 last-input-event))
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
617 repeat-key-str)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
618 (if end-macro
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
619 (kmacro-end-macro arg)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
620 (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
621 (when (consp arg)
5e3418a37a64 (kmacro-call-macro): Deal with a non-numeric prefix arg.
Miles Bader <miles@gnu.org>
parents: 47310
diff changeset
622 (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
623 (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
624 (setq repeat-key
47361
5e3418a37a64 (kmacro-call-macro): Deal with a non-numeric prefix arg.
Miles Bader <miles@gnu.org>
parents: 47310
diff changeset
625 (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
626 repeat-key
5e3418a37a64 (kmacro-call-macro): Deal with a non-numeric prefix arg.
Miles Bader <miles@gnu.org>
parents: 47310
diff changeset
627 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
628 (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
629 (while repeat-key
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
630 (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
631 repeat-key-str
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
632 (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
633 arg (> arg 1))
47388
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
634 (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
635 (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
636 (progn
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
637 (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
638 (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
639 #'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
640 (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
641 (setq repeat-key nil)))
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
642 (when last-input-event
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
643 (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
644 (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
645
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
646
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
647 ;;; Combined function key bindings:
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
648
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
649 ;;;###autoload
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
650 (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
651 "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
652 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
653
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
654 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
655 macro.
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
656
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
657 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
658 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
659
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
660 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
661 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
662 inserts previous kmacro-counter (but do not modify counter).
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
663
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
664 The macro counter can be modified via \\[kmacro-set-counter] and \\[kmacro-add-counter].
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
665 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
666 (interactive "P")
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
667 (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
668 (kmacro-insert-counter arg)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
669 (kmacro-start-macro arg)))
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
670
46961
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 ;;;###autoload
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
673 (defun kmacro-end-or-call-macro (arg &optional no-repeat)
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
674 "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
675 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
676 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
677 (interactive "P")
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
678 (cond
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
679 (defining-kbd-macro
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
680 (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
681 (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
682 (kmacro-end-macro arg)))
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
683 ((and (eq this-command 'kmacro-view-macro) ;; We are in repeat mode!
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
684 kmacro-view-last-item)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
685 (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
686 ((and arg (listp arg))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
687 (kmacro-call-ring-2nd 1))
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
688 (t
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
689 (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
690
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
691
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
692 (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
693 "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
694 (interactive "P")
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
695 (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
696 (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
697 (if keys
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
698 (kmacro-repeat-on-last-key keys))))
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
699
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
700 (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
701
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
702
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
703 ;;;###autoload
47310
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
704 (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
705 "Call last keyboard macro, ending it first if currently being defined.
50425
5f447cd26b30 (kmacro-end-and-call-macro): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 49597
diff changeset
706 With numeric prefix ARG, repeat macro that many times.
5f447cd26b30 (kmacro-end-and-call-macro): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 49597
diff changeset
707 Zero argument means repeat until there is an error.
5f447cd26b30 (kmacro-end-and-call-macro): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 49597
diff changeset
708
5f447cd26b30 (kmacro-end-and-call-macro): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 49597
diff changeset
709 To give a macro a permanent name, so you can call it
5f447cd26b30 (kmacro-end-and-call-macro): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 49597
diff changeset
710 even after defining other macros, use \\[name-last-kbd-macro]."
47310
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
711 (interactive "P")
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
712 (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
713 (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
714 (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
715
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
716
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
717 ;;;###autoload
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
718 (defun kmacro-end-call-mouse (event)
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
719 "Move point to the position clicked with the mouse and call last kbd macro.
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
720 If kbd macro currently being defined end it before activating it."
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
721 (interactive "e")
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
722 (when defining-kbd-macro
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
723 (end-kbd-macro))
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
724 (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
725 (kmacro-call-macro nil t))
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
726
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
727
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
728 ;;; Misc. commands
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
729
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
730 ;; An idea for macro bindings:
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
731 ;; Create a separate keymap installed as a minor-mode keymap (e.g. in
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
732 ;; the emulation-mode-map-alists) in which macro bindings are made
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
733 ;; independent of any other bindings. When first binding is made,
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
734 ;; the kemap is created, installed, and enabled. Key seq. C-x C-k +
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
735 ;; can then be used to toggle the use of this keymap on and off.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
736 ;; This means that it would be safe(r) to bind ordinary keys like
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
737 ;; letters and digits, provided that we inhibit the keymap while
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
738 ;; executing the macro later on (but that's controversial...)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
739
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
740 (defun kmacro-bind-to-key (arg)
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
741 "When not defining or executing a macro, offer to bind last macro to a key.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
742 The key sequences [C-x C-k 0] through [C-x C-k 9] and [C-x C-k A]
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
743 through [C-x C-k Z] are reserved for user bindings, and to bind to
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
744 one of these sequences, just enter the digit or letter, rather than
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
745 the whole sequence.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
746
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
747 You can bind to any valid key sequence, but if you try to bind to
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
748 a key with an existing command binding, you will be asked for
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
749 confirmation whether to replace that binding. Note that the
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
750 binding is made in the `global-map' keymap, so the macro binding
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
751 may be shaded by a local key binding."
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
752 (interactive "p")
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
753 (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
754 (if defining-kbd-macro
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
755 (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
756 (unless last-kbd-macro
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
757 (error "No keyboard macro defined"))
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
758 (let ((key-seq (read-key-sequence "Bind last macro to key: "))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
759 ok cmd)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
760 (when (= (length key-seq) 1)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
761 (let ((ch (aref key-seq 0)))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
762 (if (or (and (>= ch ?0) (<= ch ?9))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
763 (and (>= ch ?A) (<= ch ?Z)))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
764 (setq key-seq (concat "\C-x\C-k" key-seq)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
765 ok t))))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
766 (when (and (not (equal key-seq ""))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
767 (or ok
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
768 (not (setq cmd (key-binding key-seq)))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
769 (stringp cmd)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
770 (vectorp cmd)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
771 (yes-or-no-p (format "%s runs command %S. Bind anyway? "
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
772 (format-kbd-macro key-seq)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
773 cmd))))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
774 (define-key global-map key-seq last-kbd-macro)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
775 (message "Keyboard macro bound to %s" (format-kbd-macro key-seq))))))
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
776
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
777
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
778 (defun kmacro-view-macro (&optional arg)
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
779 "Display the last keyboard macro.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
780 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
781 (interactive)
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
782 (cond
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
783 ((or (kmacro-ring-empty-p)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
784 (not (eq last-command 'kmacro-view-macro)))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
785 (setq kmacro-view-last-item nil))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
786 ((null kmacro-view-last-item)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
787 (setq kmacro-view-last-item kmacro-ring
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
788 kmacro-view-item-no 2))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
789 ((consp kmacro-view-last-item)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
790 (setq kmacro-view-last-item (cdr kmacro-view-last-item)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
791 kmacro-view-item-no (1+ kmacro-view-item-no)))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
792 (t
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
793 (setq kmacro-view-last-item nil)))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
794 (setq this-command 'kmacro-view-macro
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
795 last-command this-command) ;; in case we repeat
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
796 (kmacro-display (if kmacro-view-last-item
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
797 (car (car kmacro-view-last-item))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
798 last-kbd-macro)
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
799 nil
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
800 (if kmacro-view-last-item
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
801 (concat (cond ((= kmacro-view-item-no 2) "2nd")
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
802 ((= kmacro-view-item-no 3) "3nd")
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
803 (t (format "%dth" kmacro-view-item-no)))
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
804 " previous macro")
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
805 "Last macro")))
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
806
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
807 (defun kmacro-view-macro-repeat (&optional arg)
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
808 "Display the last keyboard macro.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
809 If repeated, it shows previous elements in the macro ring.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
810 To execute the displayed macro ring item without changing the macro ring,
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
811 just enter C-k.
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
812 This is like `kmacro-view-macro', but allows repeating macro commands
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
813 without repeating the prefix."
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
814 (interactive)
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
815 (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
816 (kmacro-view-macro arg)
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
817 (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
818 (kmacro-repeat-on-last-key keys))))
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
819
52223
d37e0b4125e8 (kmacro-keymap): Group related bindings in
Kim F. Storm <storm@cua.dk>
parents: 50425
diff changeset
820 (put 'kmacro-view-macro-repeat 'kmacro-repeat 'ring)
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
821
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
822
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
823 (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
824 "Edit last keyboard macro."
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
825 (interactive "P")
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
826 (edit-kbd-macro "\r" arg))
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
827
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
828 (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
829
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
830
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
831 (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
832 "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
833 (interactive "P")
47094
cbc107c19e30 Changed default bindings from F7/F8 to F3/F4.
Kim F. Storm <storm@cua.dk>
parents: 47051
diff changeset
834 (edit-kbd-macro "\r" arg))
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
835
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
836
46961
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
837 (defun kmacro-edit-lossage ()
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
838 "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
839 (interactive)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
840 (kmacro-push-ring)
7e8358ec31ba Major rework based on discussions with RMS.
Kim F. Storm <storm@cua.dk>
parents: 46099
diff changeset
841 (edit-kbd-macro "\C-hl"))
46083
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
842
bd954daa704a New file.
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
843
47310
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
844 ;;; 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
845
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
846 (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
847 (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
848 (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
849 (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
850 (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
851 (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
852 (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
853 (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
854 (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
855 (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
856
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
857 (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
858 "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
859 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
860 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
861 `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
862
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
863 ;; 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
864 ;; `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
865 ;; `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
866 ;; 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
867
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
868 (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
869
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
870 (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
871 (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
872 (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
873 (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
874 (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
875 (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
876 (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
877 (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
878 (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
879 (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
880 (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
881 (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
882 (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
883 (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
884
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
885 (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
886 '(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
887 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
888 "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
889
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
890 (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
891 ;; 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
892 (let ((keys (and (not kmacro-step-edit-appending)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
893 index (substring macro index executing-macro-index)))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
894 (future (and (not kmacro-step-edit-appending)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
895 (substring macro executing-macro-index)))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
896 (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
897 (curmsg (current-message)))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
898
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
899 ;; TODO: Scroll macro if max-mini-window-height is too small.
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
900 (message (concat
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
901 (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
902 (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
903 (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
904 (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
905 (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
906 (if future " " "")
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
907 (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
908 (cond
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
909 ((minibufferp)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
910 (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
911 (propertize "\
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
912 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
913 (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
914 (curmsg
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
915 (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
916 (propertize "\
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
917 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
918 curmsg))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
919 (t ""))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
920 (if keys
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
921 (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
922 (propertize "\
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
923 --------------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
924 (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
925 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
926 TAB: execute while same, ?: toggle help
47389
a7b36abfcc69 *** empty log message ***
Kim F. Storm <storm@cua.dk>
parents: 47388
diff changeset
927 Edit: i: insert, r: replace, a: append, A: append at end,
a7b36abfcc69 *** empty log message ***
Kim F. Storm <storm@cua.dk>
parents: 47388
diff changeset
928 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
929 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
930 ----------------------------------------------------------------
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
931 " "")
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
932 (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
933 this-command)
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
934 (propertize
47310
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
935 (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
936 (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
937 (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
938 'face 'bold))))))
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 (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
941 ;; 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
942 (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
943 (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
944 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
945
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
946 ;; 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
947 (cond
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
948 ((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
949 (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
950 ;; 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
951 ;; Must be able to backtrack in case we actually execute it.
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
952 (setq restore-index executing-macro-index)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
953 (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
954 (quoted-insert 0)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
955 (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
956 (setq executing-macro-index (- executing-macro-index (length unread-command-events))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
957 next-index executing-macro-index)))))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
958
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
959 ;; 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
960 (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
961 (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
962 (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
963
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
964 ;; 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
965 (cond
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
966 ((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
967 (cond
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
968 ((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
969 (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
970 (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
971 (quoted-insert (prefix-numeric-value current-prefix-arg))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
972 (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
973 (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
974 (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
975 (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
976 (substring kmacro-step-edit-new-macro 0 (- (length unread-command-events)))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
977 executing-macro-index (- executing-macro-index (length unread-command-events)))))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
978 (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
979 prefix-arg nil)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
980 (setq act 'ignore))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
981 (t
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
982 (setq act 'act)))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
983 (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
984 ((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
985 (setq act 'act))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
986 (t
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
987 (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
988
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
989 ;; 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
990 (cond
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
991 (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
992 ((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
993 (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
994 (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
995 (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
996 ((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
997 (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
998 (t
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
999 (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
1000 (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
1001 (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
1002
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1003 ;; 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
1004 (cond
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1005 ((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
1006 nil)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1007 ((cond
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1008 ((eq act 'act)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1009 t)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1010 ((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
1011 (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
1012 t)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1013 ((eq act 'quit)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1014 (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
1015 (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
1016 nil)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1017 ((eq act 'skip)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1018 (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
1019 nil)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1020 ((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
1021 (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
1022 t)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1023 ((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
1024 (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
1025 nil)
47565
a02c3a1fc1ab (kmacro-step-edit-query): Use RET to execute rest of
Kim F. Storm <storm@cua.dk>
parents: 47457
diff changeset
1026 ((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
1027 (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
1028 (setq act t)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1029 t)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1030 ((member act '(insert-1 insert))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1031 (setq executing-macro-index (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
1032 (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
1033 nil)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1034 ((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
1035 (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
1036 (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
1037 (if (= executing-macro-index (length executing-kbd-macro))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1038 (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
1039 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
1040 nil)
47388
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1041 ((eq act 'append)
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1042 (setq kmacro-step-edit-inserting t)
47310
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1043 (if (= executing-macro-index (length executing-kbd-macro))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1044 (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
1045 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
1046 t)
47388
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1047 ((eq act 'append-end)
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1048 (if (= executing-macro-index (length executing-kbd-macro))
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1049 (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
1050 kmacro-step-edit-inserting t
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1051 kmacro-step-edit-appending t)
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1052 (setq kmacro-step-edit-active 'append-end))
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1053 (setq act t)
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1054 t)
47310
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1055 ((eq act 'help)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1056 (setq executing-macro-index (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
1057 (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
1058 nil)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1059 (t ;; Ignore unknown responses
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1060 (setq executing-macro-index (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
1061 nil))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1062 (if (> executing-macro-index (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
1063 (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
1064 (vconcat kmacro-step-edit-new-macro
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
1065 (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
1066 (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
1067 (if (eq act t) nil executing-macro-index)))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1068 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
1069 (if restore-index
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1070 (setq executing-macro-index restore-index)))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1071 (t
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1072 (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
1073 (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
1074
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1075 (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
1076 ;; 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
1077 (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
1078 (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
1079 (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
1080 (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
1081 (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
1082 cmd keys next-index)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1083 (setq executing-macro-index (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
1084 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
1085 (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
1086 ;; 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
1087 ;; 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
1088 (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
1089 (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
1090 (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
1091 (if (cond
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1092 ((null cmd)
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 cmd 'quoted-insert)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1095 (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
1096 (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
1097 (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
1098 prefix-arg nil)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1099 (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
1100 (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
1101 (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
1102 (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
1103 (setq keys (substring keys 0 (- (length unread-command-events)))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1104 executing-macro-index (- executing-macro-index (length unread-command-events))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1105 next-index executing-macro-index
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1106 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
1107 (setq cmd 'ignore)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1108 nil)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1109 ((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
1110 (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
1111 (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
1112 nil)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1113 ((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
1114 (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
1115 (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
1116 (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
1117 (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
1118 (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
1119 nil)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1120 ((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
1121 (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
1122 nil)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1123 ((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
1124 (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
1125 (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
1126 ;; 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
1127 (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
1128 (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
1129 (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
1130 (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
1131 (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
1132 t)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1133 (t nil))
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1134 (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
1135 (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
1136 (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
1137 (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
1138 (if keys
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1139 (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
1140 (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
1141
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1142 (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
1143 (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
1144 (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
1145 (cond
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1146 ((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
1147 (setq this-command 'ignore))
47388
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1148 ((eq kmacro-step-edit-active 'append-end)
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1149 (if (= executing-macro-index (length executing-kbd-macro))
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1150 (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
1151 kmacro-step-edit-inserting t
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1152 kmacro-step-edit-appending t
56bcf85aafae (kmacro-call-macro): Rephrase repeat prompt.
Kim F. Storm <storm@cua.dk>
parents: 47361
diff changeset
1153 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
1154 ((/= 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
1155 (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
1156 (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
1157 (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
1158 (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
1159 (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
1160 (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
1161 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
1162 (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
1163 (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
1164
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1165 (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
1166 (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
1167 (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
1168 (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
1169
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1170 (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
1171 (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
1172 (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
1173 (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
1174 (if 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
1175 (setq executing-macro-index kmacro-step-edit-key-index)
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47565
diff changeset
1176 (setq kmacro-step-edit-key-index executing-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
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1178
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1179 (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
1180 "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
1181
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1182 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
1183 (interactive)
5a8754f590f4 (kmacro-end-and-call-macro): New command to end and
Kim F. Storm <storm@cua.dk>
parents: 47094
diff changeset
1184 (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
1185 (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
1186 (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
1187 (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
1188 (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
1189 (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
1190 (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
1191 (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
1192 (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
1193 (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
1194 (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
1195 (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
1196 (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
1197 (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
1198 (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
1199 (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
1200 (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
1201 (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
1202 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
1203 (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
1204 (kmacro-push-ring)
a02c3a1fc1ab (kmacro-step-edit-query): Use RET to execute rest of
Kim F. Storm <storm@cua.dk>
parents: 47457
diff changeset
1205 (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
1206
46099
d441fc235798 Passed it through checkdoc. Moved `provide' to the end, where it belongs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46085
diff changeset
1207 (provide 'kmacro)
d441fc235798 Passed it through checkdoc. Moved `provide' to the end, where it belongs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46085
diff changeset
1208 ;;; kmacro.el ends here