diff options
| author | Karl Heuer | 1994-09-27 02:25:20 +0000 |
|---|---|---|
| committer | Karl Heuer | 1994-09-27 02:25:20 +0000 |
| commit | 65346ae61f1df4e7b291e9fb12dd8599712e8a2d (patch) | |
| tree | 5bc35f11d9d6858ce09566a2ed5a8a2848a0b75c | |
| parent | e8e68e490b703faf7b1431b201b8a07ad97007cf (diff) | |
| download | emacs-65346ae61f1df4e7b291e9fb12dd8599712e8a2d.tar.gz emacs-65346ae61f1df4e7b291e9fb12dd8599712e8a2d.zip | |
(Fexecute_kbd_macro): Use type test macros.
| -rw-r--r-- | src/macros.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/macros.c b/src/macros.c index 540792edae3..6ed3a862865 100644 --- a/src/macros.c +++ b/src/macros.c | |||
| @@ -202,8 +202,7 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.") | |||
| 202 | repeat = XINT (prefixarg); | 202 | repeat = XINT (prefixarg); |
| 203 | 203 | ||
| 204 | final = indirect_function (macro); | 204 | final = indirect_function (macro); |
| 205 | if (XTYPE (final) != Lisp_String | 205 | if (!STRINGP (final) && !VECTORP (final)) |
| 206 | && XTYPE (final) != Lisp_Vector) | ||
| 207 | error ("Keyboard macros must be strings or vectors."); | 206 | error ("Keyboard macros must be strings or vectors."); |
| 208 | 207 | ||
| 209 | XFASTINT (tem) = executing_macro_index; | 208 | XFASTINT (tem) = executing_macro_index; |
| @@ -220,8 +219,8 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.") | |||
| 220 | 219 | ||
| 221 | QUIT; | 220 | QUIT; |
| 222 | } | 221 | } |
| 223 | while (--repeat && (XTYPE (Vexecuting_macro) == Lisp_String | 222 | while (--repeat |
| 224 | || XTYPE (Vexecuting_macro) == Lisp_Vector)); | 223 | && (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))); |
| 225 | 224 | ||
| 226 | UNGCPRO; | 225 | UNGCPRO; |
| 227 | return unbind_to (count, Qnil); | 226 | return unbind_to (count, Qnil); |