Mercurial > emacs
annotate src/macros.c @ 111686:e8049570c647
* lisp/eshell/: Use with-silent-modifications.
* lisp/eshell/esh-cmd.el (eshell-parse-command):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/em-script.el (eshell-source-file):
Use with-silent-modifications.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 23 Nov 2010 12:36:15 -0500 |
parents | 228a5fa4eda0 |
children | 417b1e4d63cd |
rev | line source |
---|---|
246 | 1 /* Keyboard macros. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004, |
106815 | 3 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
246 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
246 | 8 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
10 (at your option) any later version. |
246 | 11 |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
246 | 19 |
20 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
2961
diff
changeset
|
21 #include <config.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100951
diff
changeset
|
22 #include <setjmp.h> |
246 | 23 #include "lisp.h" |
24 #include "macros.h" | |
25 #include "commands.h" | |
26 #include "buffer.h" | |
27 #include "window.h" | |
11341 | 28 #include "keyboard.h" |
246 | 29 |
35119
97a19f647a12
(Qkbd_macro_termination_hook): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34361
diff
changeset
|
30 Lisp_Object Qexecute_kbd_macro, Qkbd_macro_termination_hook; |
246 | 31 |
15968
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
32 /* Kbd macro currently being executed (a string or vector). */ |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
33 |
61983
f58aeabf21e7
(Vexecuting_kbd_macro): Renamed from Vexecuting_macro. All uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
57962
diff
changeset
|
34 Lisp_Object Vexecuting_kbd_macro; |
15968
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
35 |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
36 /* Index of next character to fetch from that macro. */ |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
37 |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
38 EMACS_INT executing_kbd_macro_index; |
246 | 39 |
15968
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
40 /* Number of successful iterations so far |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
41 for innermost keyboard macro. |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
42 This is not bound at each level, |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
43 so after an error, it describes the innermost interrupted macro. */ |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
44 |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
45 int executing_kbd_macro_iterations; |
15968
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
46 |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
47 /* This is the macro that was executing. |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
48 This is not bound at each level, |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
49 so after an error, it describes the innermost interrupted macro. |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
50 We use it only as a kind of flag, so no need to protect it. */ |
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
51 |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
52 Lisp_Object executing_kbd_macro; |
15968
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
53 |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106815
diff
changeset
|
54 Lisp_Object Fexecute_kbd_macro (Lisp_Object macro, Lisp_Object count, Lisp_Object loopfunc); |
246 | 55 |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
56 DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 2, "P", |
41940
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
57 doc: /* Record subsequent keyboard input, defining a keyboard macro. |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
58 The commands are recorded even as they are executed. |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
59 Use \\[end-kbd-macro] to finish recording and make the macro available. |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
60 Use \\[name-last-kbd-macro] to give it a permanent name. |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
61 Non-nil arg (prefix arg) means append to last macro defined; |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
62 this begins by re-executing that macro as if you typed it again. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47348
diff
changeset
|
63 If optional second arg, NO-EXEC, is non-nil, do not re-execute last |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
64 macro before appending to it. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
65 (Lisp_Object append, Lisp_Object no_exec) |
246 | 66 { |
11009 | 67 if (!NILP (current_kboard->defining_kbd_macro)) |
246 | 68 error ("Already defining kbd macro"); |
69 | |
11009 | 70 if (!current_kboard->kbd_macro_buffer) |
10910
b0edc245c9b7
(defining_kbd_macro): Delete; now part of perdisplay. All uses changed.
Karl Heuer <kwzh@gnu.org>
parents:
10856
diff
changeset
|
71 { |
11009 | 72 current_kboard->kbd_macro_bufsize = 30; |
73 current_kboard->kbd_macro_buffer | |
14301
621f53083d60
* macros.c (Fstart_kbd_macro): Use xmalloc.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
74 = (Lisp_Object *)xmalloc (30 * sizeof (Lisp_Object)); |
10910
b0edc245c9b7
(defining_kbd_macro): Delete; now part of perdisplay. All uses changed.
Karl Heuer <kwzh@gnu.org>
parents:
10856
diff
changeset
|
75 } |
246 | 76 update_mode_lines++; |
485 | 77 if (NILP (append)) |
246 | 78 { |
14301
621f53083d60
* macros.c (Fstart_kbd_macro): Use xmalloc.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
79 if (current_kboard->kbd_macro_bufsize > 200) |
621f53083d60
* macros.c (Fstart_kbd_macro): Use xmalloc.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
80 { |
621f53083d60
* macros.c (Fstart_kbd_macro): Use xmalloc.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
81 current_kboard->kbd_macro_bufsize = 30; |
621f53083d60
* macros.c (Fstart_kbd_macro): Use xmalloc.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
82 current_kboard->kbd_macro_buffer |
15223
be1bc5b3f14e
(Fstart_kbd_macro): Add missing xrealloc arg.
Karl Heuer <kwzh@gnu.org>
parents:
14301
diff
changeset
|
83 = (Lisp_Object *)xrealloc (current_kboard->kbd_macro_buffer, |
be1bc5b3f14e
(Fstart_kbd_macro): Add missing xrealloc arg.
Karl Heuer <kwzh@gnu.org>
parents:
14301
diff
changeset
|
84 30 * sizeof (Lisp_Object)); |
14301
621f53083d60
* macros.c (Fstart_kbd_macro): Use xmalloc.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
85 } |
11009 | 86 current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer; |
87 current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer; | |
14301
621f53083d60
* macros.c (Fstart_kbd_macro): Use xmalloc.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
88 message ("Defining kbd macro..."); |
246 | 89 } |
90 else | |
91 { | |
26825
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
92 int i, len; |
49745
282c490f6cd4
(Fstart_kbd_macro): If appending, and last keyboard
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
93 int cvt; |
26825
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
94 |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
95 /* Check the type of last-kbd-macro in case Lisp code changed it. */ |
71839
c31d8ae32af3
(Fstart_kbd_macro): Use CHECK_VECTOR_OR_STRING.
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
96 CHECK_VECTOR_OR_STRING (current_kboard->Vlast_kbd_macro); |
26825
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
97 |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
98 len = XINT (Flength (current_kboard->Vlast_kbd_macro)); |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
99 |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
100 /* Copy last-kbd-macro into the buffer, in case the Lisp code |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
101 has put another macro there. */ |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
102 if (current_kboard->kbd_macro_bufsize < len + 30) |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
103 { |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
104 current_kboard->kbd_macro_bufsize = len + 30; |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
105 current_kboard->kbd_macro_buffer |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
106 = (Lisp_Object *)xrealloc (current_kboard->kbd_macro_buffer, |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
107 (len + 30) * sizeof (Lisp_Object)); |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
108 } |
49745
282c490f6cd4
(Fstart_kbd_macro): If appending, and last keyboard
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
109 |
282c490f6cd4
(Fstart_kbd_macro): If appending, and last keyboard
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
110 /* Must convert meta modifier when copying string to vector. */ |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
111 cvt = STRINGP (current_kboard->Vlast_kbd_macro); |
26825
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
112 for (i = 0; i < len; i++) |
49745
282c490f6cd4
(Fstart_kbd_macro): If appending, and last keyboard
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
113 { |
282c490f6cd4
(Fstart_kbd_macro): If appending, and last keyboard
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
114 Lisp_Object c; |
282c490f6cd4
(Fstart_kbd_macro): If appending, and last keyboard
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
115 c = Faref (current_kboard->Vlast_kbd_macro, make_number (i)); |
49913
eabc4e7986e9
(Fstart_kbd_macro): Remove redundant assignment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49745
diff
changeset
|
116 if (cvt && NATNUMP (c) && (XFASTINT (c) & 0x80)) |
eabc4e7986e9
(Fstart_kbd_macro): Remove redundant assignment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49745
diff
changeset
|
117 XSETFASTINT (c, CHAR_META | (XFASTINT (c) & ~0x80)); |
49745
282c490f6cd4
(Fstart_kbd_macro): If appending, and last keyboard
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
118 current_kboard->kbd_macro_buffer[i] = c; |
282c490f6cd4
(Fstart_kbd_macro): If appending, and last keyboard
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
119 } |
26825
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
120 |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
121 current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer + len; |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
122 current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr; |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
123 |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
124 /* Re-execute the macro we are appending to, |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
125 for consistency of behavior. */ |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
126 if (NILP (no_exec)) |
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
127 Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, |
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
128 make_number (1), Qnil); |
26825
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
129 |
66dfce1feb9c
(Fstart_kbd_macro): Handle case where last-kbd-macro
Richard M. Stallman <rms@gnu.org>
parents:
24530
diff
changeset
|
130 message ("Appending to kbd macro..."); |
246 | 131 } |
11009 | 132 current_kboard->defining_kbd_macro = Qt; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47348
diff
changeset
|
133 |
246 | 134 return Qnil; |
135 } | |
136 | |
47348
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
137 /* Finish defining the current keyboard macro. */ |
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
138 |
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
139 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106815
diff
changeset
|
140 end_kbd_macro (void) |
47348
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
141 { |
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
142 current_kboard->defining_kbd_macro = Qnil; |
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
143 update_mode_lines++; |
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
144 current_kboard->Vlast_kbd_macro |
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
145 = make_event_array ((current_kboard->kbd_macro_end |
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
146 - current_kboard->kbd_macro_buffer), |
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
147 current_kboard->kbd_macro_buffer); |
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
148 } |
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
149 |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
150 DEFUN ("end-kbd-macro", Fend_kbd_macro, Send_kbd_macro, 0, 2, "p", |
41940
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
151 doc: /* Finish defining a keyboard macro. |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
152 The definition was started by \\[start-kbd-macro]. |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
153 The macro is now available for use via \\[call-last-kbd-macro], |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
154 or it can be given a name with \\[name-last-kbd-macro] and then invoked |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
155 under that name. |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
156 |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
157 With numeric arg, repeat macro now that many times, |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
158 counting the definition just completed as the first repetition. |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
159 An argument of zero means repeat until error. |
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
160 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47348
diff
changeset
|
161 In Lisp, optional second arg LOOPFUNC may be a function that is called prior to |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
162 each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
163 (Lisp_Object repeat, Lisp_Object loopfunc) |
246 | 164 { |
11009 | 165 if (NILP (current_kboard->defining_kbd_macro)) |
22915
ef9dd93e3077
(Fexecute_kbd_macro): Fix error message.
Richard M. Stallman <rms@gnu.org>
parents:
20299
diff
changeset
|
166 error ("Not defining kbd macro"); |
246 | 167 |
14081
addc50fc3981
(Fend_kbd_macro, Fexecute_kbd_macro): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13773
diff
changeset
|
168 if (NILP (repeat)) |
addc50fc3981
(Fend_kbd_macro, Fexecute_kbd_macro): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13773
diff
changeset
|
169 XSETFASTINT (repeat, 1); |
246 | 170 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40635
diff
changeset
|
171 CHECK_NUMBER (repeat); |
246 | 172 |
11009 | 173 if (!NILP (current_kboard->defining_kbd_macro)) |
246 | 174 { |
47348
7e9809c820b0
(end_kbd_macro): New function.
Kim F. Storm <storm@cua.dk>
parents:
47307
diff
changeset
|
175 end_kbd_macro (); |
14301
621f53083d60
* macros.c (Fstart_kbd_macro): Use xmalloc.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
176 message ("Keyboard macro defined"); |
246 | 177 } |
178 | |
14081
addc50fc3981
(Fend_kbd_macro, Fexecute_kbd_macro): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13773
diff
changeset
|
179 if (XFASTINT (repeat) == 0) |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
180 Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, repeat, loopfunc); |
246 | 181 else |
182 { | |
14081
addc50fc3981
(Fend_kbd_macro, Fexecute_kbd_macro): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13773
diff
changeset
|
183 XSETINT (repeat, XINT (repeat)-1); |
addc50fc3981
(Fend_kbd_macro, Fexecute_kbd_macro): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13773
diff
changeset
|
184 if (XINT (repeat) > 0) |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
185 Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, repeat, loopfunc); |
246 | 186 } |
187 return Qnil; | |
188 } | |
189 | |
190 /* Store character c into kbd macro being defined */ | |
191 | |
20299
608c1a9aefc8
(store_kbd_macro_char): Define as returning nothing.
Andreas Schwab <schwab@suse.de>
parents:
16562
diff
changeset
|
192 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106815
diff
changeset
|
193 store_kbd_macro_char (Lisp_Object c) |
246 | 194 { |
39135
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
195 struct kboard *kb = current_kboard; |
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
196 |
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
197 if (!NILP (kb->defining_kbd_macro)) |
246 | 198 { |
39135
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
199 if (kb->kbd_macro_ptr - kb->kbd_macro_buffer == kb->kbd_macro_bufsize) |
246 | 200 { |
39135
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
201 int ptr_offset, end_offset, nbytes; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47348
diff
changeset
|
202 |
39135
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
203 ptr_offset = kb->kbd_macro_ptr - kb->kbd_macro_buffer; |
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
204 end_offset = kb->kbd_macro_end - kb->kbd_macro_buffer; |
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
205 kb->kbd_macro_bufsize *= 2; |
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
206 nbytes = kb->kbd_macro_bufsize * sizeof *kb->kbd_macro_buffer; |
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
207 kb->kbd_macro_buffer |
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
208 = (Lisp_Object *) xrealloc (kb->kbd_macro_buffer, nbytes); |
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
209 kb->kbd_macro_ptr = kb->kbd_macro_buffer + ptr_offset; |
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
210 kb->kbd_macro_end = kb->kbd_macro_buffer + end_offset; |
246 | 211 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47348
diff
changeset
|
212 |
39135
73d05c66ef70
(store_kbd_macro_char): Fix computation of kbd_macro_end.
Gerd Moellmann <gerd@gnu.org>
parents:
37864
diff
changeset
|
213 *kb->kbd_macro_ptr++ = c; |
246 | 214 } |
215 } | |
216 | |
217 /* Declare that all chars stored so far in the kbd macro being defined | |
218 really belong to it. This is done in between editor commands. */ | |
219 | |
20299
608c1a9aefc8
(store_kbd_macro_char): Define as returning nothing.
Andreas Schwab <schwab@suse.de>
parents:
16562
diff
changeset
|
220 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106815
diff
changeset
|
221 finalize_kbd_macro_chars (void) |
246 | 222 { |
11009 | 223 current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr; |
246 | 224 } |
12845
9ee2045cda62
(Fcancel_kbd_macro_events): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12119
diff
changeset
|
225 |
9ee2045cda62
(Fcancel_kbd_macro_events): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12119
diff
changeset
|
226 DEFUN ("cancel-kbd-macro-events", Fcancel_kbd_macro_events, |
9ee2045cda62
(Fcancel_kbd_macro_events): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12119
diff
changeset
|
227 Scancel_kbd_macro_events, 0, 0, 0, |
41940
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
228 doc: /* Cancel the events added to a keyboard macro for this command. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
229 (void) |
12845
9ee2045cda62
(Fcancel_kbd_macro_events): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12119
diff
changeset
|
230 { |
9ee2045cda62
(Fcancel_kbd_macro_events): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12119
diff
changeset
|
231 current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_end; |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
26825
diff
changeset
|
232 return Qnil; |
12845
9ee2045cda62
(Fcancel_kbd_macro_events): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12119
diff
changeset
|
233 } |
13773
7d50ac085b12
(Fstore_kbd_macro_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12845
diff
changeset
|
234 |
7d50ac085b12
(Fstore_kbd_macro_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12845
diff
changeset
|
235 DEFUN ("store-kbd-macro-event", Fstore_kbd_macro_event, |
7d50ac085b12
(Fstore_kbd_macro_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12845
diff
changeset
|
236 Sstore_kbd_macro_event, 1, 1, 0, |
41940
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
237 doc: /* Store EVENT into the keyboard macro being defined. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
238 (Lisp_Object event) |
13773
7d50ac085b12
(Fstore_kbd_macro_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12845
diff
changeset
|
239 { |
7d50ac085b12
(Fstore_kbd_macro_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12845
diff
changeset
|
240 store_kbd_macro_char (event); |
7d50ac085b12
(Fstore_kbd_macro_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12845
diff
changeset
|
241 return Qnil; |
7d50ac085b12
(Fstore_kbd_macro_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12845
diff
changeset
|
242 } |
246 | 243 |
244 DEFUN ("call-last-kbd-macro", Fcall_last_kbd_macro, Scall_last_kbd_macro, | |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
245 0, 2, "p", |
41940
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
246 doc: /* Call the last keyboard macro that you defined with \\[start-kbd-macro]. |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
247 |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
248 A prefix argument serves as a repeat count. Zero means repeat until error. |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
249 |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
250 To make a macro permanent so you can call it even after |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47348
diff
changeset
|
251 defining others, use \\[name-last-kbd-macro]. |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
252 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47348
diff
changeset
|
253 In Lisp, optional second arg LOOPFUNC may be a function that is called prior to |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
254 each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
255 (Lisp_Object prefix, Lisp_Object loopfunc) |
246 | 256 { |
16562
4999fc12564e
(Fcall_last_kbd_macro): Set this_command from last_command
Richard M. Stallman <rms@gnu.org>
parents:
15976
diff
changeset
|
257 /* Don't interfere with recognition of the previous command |
4999fc12564e
(Fcall_last_kbd_macro): Set this_command from last_command
Richard M. Stallman <rms@gnu.org>
parents:
15976
diff
changeset
|
258 from before this macro started. */ |
22968
edcf24874ef5
(Fcall_last_kbd_macro): this_command renamed to Vthis_command.
Richard M. Stallman <rms@gnu.org>
parents:
22915
diff
changeset
|
259 Vthis_command = current_kboard->Vlast_command; |
24530
14cc75ebfd7b
(Fexecute_kbd_macro): Save real_this_command.
Karl Heuer <kwzh@gnu.org>
parents:
24482
diff
changeset
|
260 /* C-x z after the macro should repeat the macro. */ |
14cc75ebfd7b
(Fexecute_kbd_macro): Save real_this_command.
Karl Heuer <kwzh@gnu.org>
parents:
24482
diff
changeset
|
261 real_this_command = current_kboard->Vlast_kbd_macro; |
16562
4999fc12564e
(Fcall_last_kbd_macro): Set this_command from last_command
Richard M. Stallman <rms@gnu.org>
parents:
15976
diff
changeset
|
262 |
11009 | 263 if (! NILP (current_kboard->defining_kbd_macro)) |
246 | 264 error ("Can't execute anonymous macro while defining one"); |
11009 | 265 else if (NILP (current_kboard->Vlast_kbd_macro)) |
246 | 266 error ("No kbd macro has been defined"); |
267 else | |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
268 Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, prefix, loopfunc); |
16562
4999fc12564e
(Fcall_last_kbd_macro): Set this_command from last_command
Richard M. Stallman <rms@gnu.org>
parents:
15976
diff
changeset
|
269 |
4999fc12564e
(Fcall_last_kbd_macro): Set this_command from last_command
Richard M. Stallman <rms@gnu.org>
parents:
15976
diff
changeset
|
270 /* command_loop_1 sets this to nil before it returns; |
4999fc12564e
(Fcall_last_kbd_macro): Set this_command from last_command
Richard M. Stallman <rms@gnu.org>
parents:
15976
diff
changeset
|
271 get back the last command within the macro |
4999fc12564e
(Fcall_last_kbd_macro): Set this_command from last_command
Richard M. Stallman <rms@gnu.org>
parents:
15976
diff
changeset
|
272 so that it can be last, again, after we return. */ |
22968
edcf24874ef5
(Fcall_last_kbd_macro): this_command renamed to Vthis_command.
Richard M. Stallman <rms@gnu.org>
parents:
22915
diff
changeset
|
273 Vthis_command = current_kboard->Vlast_command; |
16562
4999fc12564e
(Fcall_last_kbd_macro): Set this_command from last_command
Richard M. Stallman <rms@gnu.org>
parents:
15976
diff
changeset
|
274 |
246 | 275 return Qnil; |
276 } | |
277 | |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
278 /* Restore Vexecuting_kbd_macro and executing_kbd_macro_index. |
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
279 Called when the unwind-protect in Fexecute_kbd_macro gets invoked. */ |
15968
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
280 |
246 | 281 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106815
diff
changeset
|
282 pop_kbd_macro (Lisp_Object info) |
246 | 283 { |
284 Lisp_Object tem; | |
61983
f58aeabf21e7
(Vexecuting_kbd_macro): Renamed from Vexecuting_macro. All uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
57962
diff
changeset
|
285 Vexecuting_kbd_macro = XCAR (info); |
24530
14cc75ebfd7b
(Fexecute_kbd_macro): Save real_this_command.
Karl Heuer <kwzh@gnu.org>
parents:
24482
diff
changeset
|
286 tem = XCDR (info); |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
287 executing_kbd_macro_index = XINT (XCAR (tem)); |
24530
14cc75ebfd7b
(Fexecute_kbd_macro): Save real_this_command.
Karl Heuer <kwzh@gnu.org>
parents:
24482
diff
changeset
|
288 real_this_command = XCDR (tem); |
35119
97a19f647a12
(Qkbd_macro_termination_hook): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34361
diff
changeset
|
289 Frun_hooks (1, &Qkbd_macro_termination_hook); |
246 | 290 return Qnil; |
291 } | |
292 | |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
293 DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 3, 0, |
41940
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
294 doc: /* Execute MACRO as string of editor command characters. |
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
295 If MACRO is a symbol, its function definition is used. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47348
diff
changeset
|
296 COUNT is a repeat count, or nil for once, or 0 for infinite loop. |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
297 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47348
diff
changeset
|
298 Optional third arg LOOPFUNC may be a function that is called prior to |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
299 each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
300 (Lisp_Object macro, Lisp_Object count, Lisp_Object loopfunc) |
246 | 301 { |
302 Lisp_Object final; | |
303 Lisp_Object tem; | |
46295
b77ef572e1c9
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
41940
diff
changeset
|
304 int pdlcount = SPECPDL_INDEX (); |
246 | 305 int repeat = 1; |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
306 struct gcpro gcpro1, gcpro2; |
15968
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
307 int success_count = 0; |
246 | 308 |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
309 executing_kbd_macro_iterations = 0; |
24482
9b722e922325
(Fexecute_kbd_macro): Initialize executing_macro_iterations at beginning.
Karl Heuer <kwzh@gnu.org>
parents:
23434
diff
changeset
|
310 |
14100
0950fefc4bd1
(Fexecute_kbd_macro): Reindent properly.
Erik Naggum <erik@naggum.no>
parents:
14094
diff
changeset
|
311 if (!NILP (count)) |
0950fefc4bd1
(Fexecute_kbd_macro): Reindent properly.
Erik Naggum <erik@naggum.no>
parents:
14094
diff
changeset
|
312 { |
0950fefc4bd1
(Fexecute_kbd_macro): Reindent properly.
Erik Naggum <erik@naggum.no>
parents:
14094
diff
changeset
|
313 count = Fprefix_numeric_value (count); |
0950fefc4bd1
(Fexecute_kbd_macro): Reindent properly.
Erik Naggum <erik@naggum.no>
parents:
14094
diff
changeset
|
314 repeat = XINT (count); |
0950fefc4bd1
(Fexecute_kbd_macro): Reindent properly.
Erik Naggum <erik@naggum.no>
parents:
14094
diff
changeset
|
315 } |
246 | 316 |
647 | 317 final = indirect_function (macro); |
9122
9ba3f17d6631
(Fexecute_kbd_macro): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
4696
diff
changeset
|
318 if (!STRINGP (final) && !VECTORP (final)) |
22915
ef9dd93e3077
(Fexecute_kbd_macro): Fix error message.
Richard M. Stallman <rms@gnu.org>
parents:
20299
diff
changeset
|
319 error ("Keyboard macros must be strings or vectors"); |
246 | 320 |
61983
f58aeabf21e7
(Vexecuting_kbd_macro): Renamed from Vexecuting_macro. All uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
57962
diff
changeset
|
321 tem = Fcons (Vexecuting_kbd_macro, |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
322 Fcons (make_number (executing_kbd_macro_index), |
24530
14cc75ebfd7b
(Fexecute_kbd_macro): Save real_this_command.
Karl Heuer <kwzh@gnu.org>
parents:
24482
diff
changeset
|
323 real_this_command)); |
246 | 324 record_unwind_protect (pop_kbd_macro, tem); |
325 | |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
326 GCPRO2 (final, loopfunc); |
246 | 327 do |
328 { | |
61983
f58aeabf21e7
(Vexecuting_kbd_macro): Renamed from Vexecuting_macro. All uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
57962
diff
changeset
|
329 Vexecuting_kbd_macro = final; |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
330 executing_kbd_macro = final; |
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
331 executing_kbd_macro_index = 0; |
246 | 332 |
12119
d7b51659a56d
(Fexecute_kbd_macro): Vprefix_arg is now part of kboard.
Karl Heuer <kwzh@gnu.org>
parents:
11341
diff
changeset
|
333 current_kboard->Vprefix_arg = Qnil; |
46887
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
334 |
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
335 if (!NILP (loopfunc)) |
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
336 { |
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
337 Lisp_Object cont; |
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
338 cont = call0 (loopfunc); |
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
339 if (NILP (cont)) |
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
340 break; |
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
341 } |
d9b11a5b4ebf
(Fstart_kbd_macro): Added NO-EXEC argument to inhibit
Kim F. Storm <storm@cua.dk>
parents:
46295
diff
changeset
|
342 |
246 | 343 command_loop_1 (); |
1682
af0995b9b142
* macros.c (Fend_kbd_macro): Don't use XFASTINT to check if arg is
Jim Blandy <jimb@redhat.com>
parents:
647
diff
changeset
|
344 |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
345 executing_kbd_macro_iterations = ++success_count; |
15968
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
346 |
1682
af0995b9b142
* macros.c (Fend_kbd_macro): Don't use XFASTINT to check if arg is
Jim Blandy <jimb@redhat.com>
parents:
647
diff
changeset
|
347 QUIT; |
246 | 348 } |
9122
9ba3f17d6631
(Fexecute_kbd_macro): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
4696
diff
changeset
|
349 while (--repeat |
61983
f58aeabf21e7
(Vexecuting_kbd_macro): Renamed from Vexecuting_macro. All uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
57962
diff
changeset
|
350 && (STRINGP (Vexecuting_kbd_macro) || VECTORP (Vexecuting_kbd_macro))); |
246 | 351 |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
352 executing_kbd_macro = Qnil; |
15968
231e14e38946
(executing_macro_iterations, executing_macro): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
15223
diff
changeset
|
353 |
61983
f58aeabf21e7
(Vexecuting_kbd_macro): Renamed from Vexecuting_macro. All uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
57962
diff
changeset
|
354 real_this_command = Vexecuting_kbd_macro; |
23434
1dd05eb0443d
(Fexecute_kbd_macro): Set real_this_command.
Richard M. Stallman <rms@gnu.org>
parents:
22968
diff
changeset
|
355 |
246 | 356 UNGCPRO; |
14094
e5e4fe8e968f
(Fexecute_kbd_macro): Local var `pdlcount' renamed from
Karl Heuer <kwzh@gnu.org>
parents:
14081
diff
changeset
|
357 return unbind_to (pdlcount, Qnil); |
246 | 358 } |
359 | |
20299
608c1a9aefc8
(store_kbd_macro_char): Define as returning nothing.
Andreas Schwab <schwab@suse.de>
parents:
16562
diff
changeset
|
360 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106815
diff
changeset
|
361 init_macros (void) |
246 | 362 { |
61983
f58aeabf21e7
(Vexecuting_kbd_macro): Renamed from Vexecuting_macro. All uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
57962
diff
changeset
|
363 Vexecuting_kbd_macro = Qnil; |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
364 executing_kbd_macro = Qnil; |
246 | 365 } |
366 | |
20299
608c1a9aefc8
(store_kbd_macro_char): Define as returning nothing.
Andreas Schwab <schwab@suse.de>
parents:
16562
diff
changeset
|
367 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106815
diff
changeset
|
368 syms_of_macros (void) |
246 | 369 { |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
370 Qexecute_kbd_macro = intern_c_string ("execute-kbd-macro"); |
246 | 371 staticpro (&Qexecute_kbd_macro); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
372 Qkbd_macro_termination_hook = intern_c_string ("kbd-macro-termination-hook"); |
35119
97a19f647a12
(Qkbd_macro_termination_hook): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34361
diff
changeset
|
373 staticpro (&Qkbd_macro_termination_hook); |
246 | 374 |
375 defsubr (&Sstart_kbd_macro); | |
376 defsubr (&Send_kbd_macro); | |
377 defsubr (&Scall_last_kbd_macro); | |
378 defsubr (&Sexecute_kbd_macro); | |
12845
9ee2045cda62
(Fcancel_kbd_macro_events): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12119
diff
changeset
|
379 defsubr (&Scancel_kbd_macro_events); |
13773
7d50ac085b12
(Fstore_kbd_macro_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12845
diff
changeset
|
380 defsubr (&Sstore_kbd_macro_event); |
246 | 381 |
11009 | 382 DEFVAR_KBOARD ("defining-kbd-macro", defining_kbd_macro, |
57962
47f8ff58e33e
(syms_of_macros) <defining-kbd-macro>: Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
383 doc: /* Non-nil while a keyboard macro is being defined. Don't set this! |
47f8ff58e33e
(syms_of_macros) <defining-kbd-macro>: Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
384 The value is the symbol `append' while appending to the definition of |
47f8ff58e33e
(syms_of_macros) <defining-kbd-macro>: Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
385 an existing macro. */); |
246 | 386 |
61983
f58aeabf21e7
(Vexecuting_kbd_macro): Renamed from Vexecuting_macro. All uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
57962
diff
changeset
|
387 DEFVAR_LISP ("executing-kbd-macro", &Vexecuting_kbd_macro, |
f58aeabf21e7
(Vexecuting_kbd_macro): Renamed from Vexecuting_macro. All uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
57962
diff
changeset
|
388 doc: /* Currently executing keyboard macro (string or vector). |
f58aeabf21e7
(Vexecuting_kbd_macro): Renamed from Vexecuting_macro. All uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
57962
diff
changeset
|
389 This is nil when not executing a keyboard macro. */); |
246 | 390 |
62024
4f7e1a56469e
(executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents:
61983
diff
changeset
|
391 DEFVAR_INT ("executing-kbd-macro-index", &executing_kbd_macro_index, |
47307
06c376f5df86
(executing_macro_index): Change type to EMACS_INT.
Kim F. Storm <storm@cua.dk>
parents:
46887
diff
changeset
|
392 doc: /* Index in currently executing keyboard macro; undefined if none executing. */); |
06c376f5df86
(executing_macro_index): Change type to EMACS_INT.
Kim F. Storm <storm@cua.dk>
parents:
46887
diff
changeset
|
393 |
11009 | 394 DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro, |
41940
63819c5d6049
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
395 doc: /* Last kbd macro defined, as a string or vector; nil if none defined. */); |
246 | 396 } |
52401 | 397 |
398 /* arch-tag: d293fcc9-2266-4163-9198-7fa0de12ec9e | |
399 (do not change this comment) */ |