mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-12 02:40:34 -08:00
Fixes Bug#15880. This patch also makes Q constants (e.g., Qnil) constant addresses from the C point of view. * make-docfile.c: Revamp to generate table of symbols, too. Include <stdbool.h>. (xstrdup): New function. (main): Don't process the same file twice. (SYMBOL): New constant in enum global_type. (struct symbol): Turn 'value' member into a union, either v.value for int or v.svalue for string. All uses changed. (add_global): New arg svalue, which overrides value, so that globals can have a string value. (close_emacs_global): New arg num_symbols; all uses changed. Output lispsym decl. (write_globals): Output symbol globals too. Output more ATTRIBUTE_CONST, now that Qnil etc. are C constants. Output defsym_name table. (scan_c_file): Move most of guts into ... (scan_c_stream): ... new function. Scan for DEFSYMs and record symbols found. Don't read past EOF if file doesn't end in newline. * alloc.c, bidi.c, buffer.c, bytecode.c, callint.c, casefiddle: * casetab.c, category.c, ccl.c, charset.c, chartab.c, cmds.c, coding.c: * composite.c, data.c, dbusbind.c, decompress.c, dired.c, dispnew.c: * doc.c, editfns.c, emacs.c, eval.c, fileio.c, fns.c, font.c, fontset.c: * frame.c, fringe.c, ftfont.c, ftxfont.c, gfilenotify.c, gnutls.c: * image.c, inotify.c, insdel.c, keyboard.c, keymap.c, lread.c: * macfont.m, macros.c, minibuf.c, nsfns.m, nsfont.m, nsimage.m: * nsmenu.m, nsselect.m, nsterm.m, print.c, process.c, profiler.c: * search.c, sound.c, syntax.c, term.c, terminal.c, textprop.c, undo.c: * window.c, xdisp.c, xfaces.c, xfns.c, xftfont.c, xmenu.c, xml.c: * xselect.c, xsettings.c, xterm.c: Remove Q vars that represent symbols (e.g., Qnil, Qt, Qemacs). These names are now defined automatically by make-docfile. * alloc.c (init_symbol): New function. (Fmake_symbol): Use it. (c_symbol_p): New function. (valid_lisp_object_p, purecopy): Use it. * alloc.c (marked_pinned_symbols): Use make_lisp_symbol instead of make_lisp_ptr. (garbage_collect_1): Mark lispsym symbols. (CHECK_ALLOCATED_AND_LIVE_SYMBOL): New macro. (mark_object): Use it. (sweep_symbols): Sweep lispsym symbols. (symbol_uses_obj): New function. (which_symbols): Use it. Work for lispsym symbols, too. (init_alloc_once): Initialize Vpurify_flag here; no need to wait, since Qt's address is already known now. (syms_of_alloc): Add lispsym count to symbols_consed. * buffer.c (init_buffer_once): Compare to Qnil, not to make_number (0), when testing whether storage is all bits zero. * dispextern (struct image_type): * font.c (font_property_table): * frame.c (struct frame_parm_table, frame_parms): * keyboard.c (scroll_bar_parts, struct event_head): * xdisp.c (struct props): Use XSYMBOL_INIT (Qfoo) and struct Lisp_Symbol * rather than &Qfoo and Lisp_Object *, since Qfoo is no longer an object whose address can be taken. All uses changed. * eval.c (run_hook): New function. Most uses of Frun_hooks changed to use it, so that they no longer need to take the address of a Lisp sym. (syms_of_eval): Don't use DEFSYM on Vrun_hooks, as it's a variable. * frame.c (syms_of_frame): Add defsyms for the frame_parms table. * keyboard.c (syms_of_keyboard): Don't DEFSYM Qmenu_bar here. DEFSYM Qdeactivate_mark before the corresponding var. * keymap.c (syms_of_keymap): Use DEFSYM for Qmenu_bar and Qmode_line instead of interning their symbols; this avoids duplicates. (LISP_INITIALLY, TAG_PTR) (DEFINE_LISP_SYMBOL_BEGIN, DEFINE_LISP_SYMBOL_END, XSYMBOL_INIT): New macros. (LISP_INITIALLY_ZERO): Use it. (enum symbol_interned, enum symbol_redirect, struct Lisp_Symbol) (EXFUN, DEFUN_ARGS_MANY, DEFUN_ARGS_UNEVALLED, DEFUN_ARGS_*): Move decls up, to avoid forward uses. Include globals.h earlier, too. (make_lisp_symbol): New function. (XSETSYMBOL): Use it. (DEFSYM): Now just a placeholder for make-docfile. * lread.c (DEFINE_SYMBOLS): Define, for globals.h. (intern_sym): New function, with body taken from old intern_driver. (intern_driver): Use it. Last arg is now Lisp integer, not ptrdiff_t. All uses changed. (define_symbol): New function. (init_obarray): Define the C symbols taken from lispsym. Use plain DEFSYM for Qt and Qnil. * syntax.c (init_syntax_once): No need to worry about Qchar_table_extra_slots.
390 lines
12 KiB
C
390 lines
12 KiB
C
/* Keyboard macros.
|
||
|
||
Copyright (C) 1985-1986, 1993, 2000-2015 Free Software Foundation, Inc.
|
||
|
||
This file is part of GNU Emacs.
|
||
|
||
GNU Emacs is free software: you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation, either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
GNU Emacs is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
|
||
#include <config.h>
|
||
|
||
#include "lisp.h"
|
||
#include "macros.h"
|
||
#include "commands.h"
|
||
#include "character.h"
|
||
#include "buffer.h"
|
||
#include "window.h"
|
||
#include "keyboard.h"
|
||
|
||
/* Number of successful iterations so far
|
||
for innermost keyboard macro.
|
||
This is not bound at each level,
|
||
so after an error, it describes the innermost interrupted macro. */
|
||
|
||
EMACS_INT executing_kbd_macro_iterations;
|
||
|
||
/* This is the macro that was executing.
|
||
This is not bound at each level,
|
||
so after an error, it describes the innermost interrupted macro.
|
||
We use it only as a kind of flag, so no need to protect it. */
|
||
|
||
Lisp_Object executing_kbd_macro;
|
||
|
||
DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 2, "P",
|
||
doc: /* Record subsequent keyboard input, defining a keyboard macro.
|
||
The commands are recorded even as they are executed.
|
||
Use \\[end-kbd-macro] to finish recording and make the macro available.
|
||
Use \\[name-last-kbd-macro] to give it a permanent name.
|
||
Non-nil arg (prefix arg) means append to last macro defined;
|
||
this begins by re-executing that macro as if you typed it again.
|
||
If optional second arg, NO-EXEC, is non-nil, do not re-execute last
|
||
macro before appending to it. */)
|
||
(Lisp_Object append, Lisp_Object no_exec)
|
||
{
|
||
if (!NILP (KVAR (current_kboard, defining_kbd_macro)))
|
||
error ("Already defining kbd macro");
|
||
|
||
if (!current_kboard->kbd_macro_buffer)
|
||
{
|
||
current_kboard->kbd_macro_buffer = xmalloc (30 * word_size);
|
||
current_kboard->kbd_macro_bufsize = 30;
|
||
current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer;
|
||
current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer;
|
||
}
|
||
update_mode_lines = 19;
|
||
if (NILP (append))
|
||
{
|
||
if (current_kboard->kbd_macro_bufsize > 200)
|
||
{
|
||
current_kboard->kbd_macro_buffer
|
||
= xrealloc (current_kboard->kbd_macro_buffer,
|
||
30 * word_size);
|
||
current_kboard->kbd_macro_bufsize = 30;
|
||
}
|
||
current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer;
|
||
current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer;
|
||
message1 ("Defining kbd macro...");
|
||
}
|
||
else
|
||
{
|
||
int incr = 30;
|
||
ptrdiff_t i, len;
|
||
bool cvt;
|
||
|
||
/* Check the type of last-kbd-macro in case Lisp code changed it. */
|
||
len = CHECK_VECTOR_OR_STRING (KVAR (current_kboard, Vlast_kbd_macro));
|
||
|
||
/* Copy last-kbd-macro into the buffer, in case the Lisp code
|
||
has put another macro there. */
|
||
if (current_kboard->kbd_macro_bufsize - incr < len)
|
||
current_kboard->kbd_macro_buffer =
|
||
xpalloc (current_kboard->kbd_macro_buffer,
|
||
¤t_kboard->kbd_macro_bufsize,
|
||
len - current_kboard->kbd_macro_bufsize + incr, -1,
|
||
sizeof *current_kboard->kbd_macro_buffer);
|
||
|
||
/* Must convert meta modifier when copying string to vector. */
|
||
cvt = STRINGP (KVAR (current_kboard, Vlast_kbd_macro));
|
||
for (i = 0; i < len; i++)
|
||
{
|
||
Lisp_Object c;
|
||
c = Faref (KVAR (current_kboard, Vlast_kbd_macro), make_number (i));
|
||
if (cvt && NATNUMP (c) && (XFASTINT (c) & 0x80))
|
||
XSETFASTINT (c, CHAR_META | (XFASTINT (c) & ~0x80));
|
||
current_kboard->kbd_macro_buffer[i] = c;
|
||
}
|
||
|
||
current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer + len;
|
||
current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr;
|
||
|
||
/* Re-execute the macro we are appending to,
|
||
for consistency of behavior. */
|
||
if (NILP (no_exec))
|
||
Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro),
|
||
make_number (1), Qnil);
|
||
|
||
message1 ("Appending to kbd macro...");
|
||
}
|
||
kset_defining_kbd_macro (current_kboard, Qt);
|
||
|
||
return Qnil;
|
||
}
|
||
|
||
/* Finish defining the current keyboard macro. */
|
||
|
||
void
|
||
end_kbd_macro (void)
|
||
{
|
||
kset_defining_kbd_macro (current_kboard, Qnil);
|
||
update_mode_lines = 20;
|
||
kset_last_kbd_macro
|
||
(current_kboard,
|
||
make_event_array ((current_kboard->kbd_macro_end
|
||
- current_kboard->kbd_macro_buffer),
|
||
current_kboard->kbd_macro_buffer));
|
||
}
|
||
|
||
DEFUN ("end-kbd-macro", Fend_kbd_macro, Send_kbd_macro, 0, 2, "p",
|
||
doc: /* Finish defining a keyboard macro.
|
||
The definition was started by \\[start-kbd-macro].
|
||
The macro is now available for use via \\[call-last-kbd-macro],
|
||
or it can be given a name with \\[name-last-kbd-macro] and then invoked
|
||
under that name.
|
||
|
||
With numeric arg, repeat macro now that many times,
|
||
counting the definition just completed as the first repetition.
|
||
An argument of zero means repeat until error.
|
||
|
||
In Lisp, optional second arg LOOPFUNC may be a function that is called prior to
|
||
each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
|
||
(Lisp_Object repeat, Lisp_Object loopfunc)
|
||
{
|
||
if (NILP (KVAR (current_kboard, defining_kbd_macro)))
|
||
error ("Not defining kbd macro");
|
||
|
||
if (NILP (repeat))
|
||
XSETFASTINT (repeat, 1);
|
||
else
|
||
CHECK_NUMBER (repeat);
|
||
|
||
if (!NILP (KVAR (current_kboard, defining_kbd_macro)))
|
||
{
|
||
end_kbd_macro ();
|
||
message1 ("Keyboard macro defined");
|
||
}
|
||
|
||
if (XFASTINT (repeat) == 0)
|
||
Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro), repeat, loopfunc);
|
||
else if (XINT (repeat) > 1)
|
||
{
|
||
XSETINT (repeat, XINT (repeat) - 1);
|
||
Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro),
|
||
repeat, loopfunc);
|
||
}
|
||
return Qnil;
|
||
}
|
||
|
||
/* Store character c into kbd macro being defined. */
|
||
|
||
void
|
||
store_kbd_macro_char (Lisp_Object c)
|
||
{
|
||
struct kboard *kb = current_kboard;
|
||
|
||
if (!NILP (KVAR (kb, defining_kbd_macro)))
|
||
{
|
||
if (kb->kbd_macro_ptr - kb->kbd_macro_buffer == kb->kbd_macro_bufsize)
|
||
{
|
||
ptrdiff_t ptr_offset, end_offset, nbytes;
|
||
|
||
ptr_offset = kb->kbd_macro_ptr - kb->kbd_macro_buffer;
|
||
end_offset = kb->kbd_macro_end - kb->kbd_macro_buffer;
|
||
if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *kb->kbd_macro_buffer / 2
|
||
< kb->kbd_macro_bufsize)
|
||
memory_full (SIZE_MAX);
|
||
nbytes = kb->kbd_macro_bufsize * (2 * sizeof *kb->kbd_macro_buffer);
|
||
kb->kbd_macro_buffer = xrealloc (kb->kbd_macro_buffer, nbytes);
|
||
kb->kbd_macro_bufsize *= 2;
|
||
kb->kbd_macro_ptr = kb->kbd_macro_buffer + ptr_offset;
|
||
kb->kbd_macro_end = kb->kbd_macro_buffer + end_offset;
|
||
}
|
||
|
||
*kb->kbd_macro_ptr++ = c;
|
||
}
|
||
}
|
||
|
||
/* Declare that all chars stored so far in the kbd macro being defined
|
||
really belong to it. This is done in between editor commands. */
|
||
|
||
void
|
||
finalize_kbd_macro_chars (void)
|
||
{
|
||
current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr;
|
||
}
|
||
|
||
DEFUN ("cancel-kbd-macro-events", Fcancel_kbd_macro_events,
|
||
Scancel_kbd_macro_events, 0, 0, 0,
|
||
doc: /* Cancel the events added to a keyboard macro for this command. */)
|
||
(void)
|
||
{
|
||
current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_end;
|
||
return Qnil;
|
||
}
|
||
|
||
DEFUN ("store-kbd-macro-event", Fstore_kbd_macro_event,
|
||
Sstore_kbd_macro_event, 1, 1, 0,
|
||
doc: /* Store EVENT into the keyboard macro being defined. */)
|
||
(Lisp_Object event)
|
||
{
|
||
store_kbd_macro_char (event);
|
||
return Qnil;
|
||
}
|
||
|
||
DEFUN ("call-last-kbd-macro", Fcall_last_kbd_macro, Scall_last_kbd_macro,
|
||
0, 2, "p",
|
||
doc: /* Call the last keyboard macro that you defined with \\[start-kbd-macro].
|
||
|
||
A prefix argument serves as a repeat count. Zero means repeat until error.
|
||
|
||
To make a macro permanent so you can call it even after
|
||
defining others, use \\[name-last-kbd-macro].
|
||
|
||
In Lisp, optional second arg LOOPFUNC may be a function that is called prior to
|
||
each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
|
||
(Lisp_Object prefix, Lisp_Object loopfunc)
|
||
{
|
||
/* Don't interfere with recognition of the previous command
|
||
from before this macro started. */
|
||
Vthis_command = KVAR (current_kboard, Vlast_command);
|
||
/* C-x z after the macro should repeat the macro. */
|
||
Vreal_this_command = KVAR (current_kboard, Vlast_kbd_macro);
|
||
|
||
if (! NILP (KVAR (current_kboard, defining_kbd_macro)))
|
||
error ("Can't execute anonymous macro while defining one");
|
||
else if (NILP (KVAR (current_kboard, Vlast_kbd_macro)))
|
||
error ("No kbd macro has been defined");
|
||
else
|
||
Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro), prefix, loopfunc);
|
||
|
||
/* command_loop_1 sets this to nil before it returns;
|
||
get back the last command within the macro
|
||
so that it can be last, again, after we return. */
|
||
Vthis_command = KVAR (current_kboard, Vlast_command);
|
||
|
||
return Qnil;
|
||
}
|
||
|
||
/* Restore Vexecuting_kbd_macro and executing_kbd_macro_index.
|
||
Called when the unwind-protect in Fexecute_kbd_macro gets invoked. */
|
||
|
||
static void
|
||
pop_kbd_macro (Lisp_Object info)
|
||
{
|
||
Lisp_Object tem;
|
||
Vexecuting_kbd_macro = XCAR (info);
|
||
tem = XCDR (info);
|
||
executing_kbd_macro_index = XINT (XCAR (tem));
|
||
Vreal_this_command = XCDR (tem);
|
||
run_hook (Qkbd_macro_termination_hook);
|
||
}
|
||
|
||
DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 3, 0,
|
||
doc: /* Execute MACRO as string of editor command characters.
|
||
MACRO can also be a vector of keyboard events. If MACRO is a symbol,
|
||
its function definition is used.
|
||
COUNT is a repeat count, or nil for once, or 0 for infinite loop.
|
||
|
||
Optional third arg LOOPFUNC may be a function that is called prior to
|
||
each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
|
||
(Lisp_Object macro, Lisp_Object count, Lisp_Object loopfunc)
|
||
{
|
||
Lisp_Object final;
|
||
Lisp_Object tem;
|
||
ptrdiff_t pdlcount = SPECPDL_INDEX ();
|
||
EMACS_INT repeat = 1;
|
||
struct gcpro gcpro1, gcpro2;
|
||
EMACS_INT success_count = 0;
|
||
|
||
executing_kbd_macro_iterations = 0;
|
||
|
||
if (!NILP (count))
|
||
{
|
||
count = Fprefix_numeric_value (count);
|
||
repeat = XINT (count);
|
||
}
|
||
|
||
final = indirect_function (macro);
|
||
if (!STRINGP (final) && !VECTORP (final))
|
||
error ("Keyboard macros must be strings or vectors");
|
||
|
||
tem = Fcons (Vexecuting_kbd_macro,
|
||
Fcons (make_number (executing_kbd_macro_index),
|
||
Vreal_this_command));
|
||
record_unwind_protect (pop_kbd_macro, tem);
|
||
|
||
GCPRO2 (final, loopfunc);
|
||
do
|
||
{
|
||
Vexecuting_kbd_macro = final;
|
||
executing_kbd_macro = final;
|
||
executing_kbd_macro_index = 0;
|
||
|
||
kset_prefix_arg (current_kboard, Qnil);
|
||
|
||
if (!NILP (loopfunc))
|
||
{
|
||
Lisp_Object cont;
|
||
cont = call0 (loopfunc);
|
||
if (NILP (cont))
|
||
break;
|
||
}
|
||
|
||
command_loop_1 ();
|
||
|
||
executing_kbd_macro_iterations = ++success_count;
|
||
|
||
QUIT;
|
||
}
|
||
while (--repeat
|
||
&& (STRINGP (Vexecuting_kbd_macro) || VECTORP (Vexecuting_kbd_macro)));
|
||
|
||
executing_kbd_macro = Qnil;
|
||
|
||
Vreal_this_command = Vexecuting_kbd_macro;
|
||
|
||
UNGCPRO;
|
||
return unbind_to (pdlcount, Qnil);
|
||
}
|
||
|
||
void
|
||
init_macros (void)
|
||
{
|
||
Vexecuting_kbd_macro = Qnil;
|
||
executing_kbd_macro = Qnil;
|
||
}
|
||
|
||
void
|
||
syms_of_macros (void)
|
||
{
|
||
DEFSYM (Qexecute_kbd_macro, "execute-kbd-macro");
|
||
|
||
DEFVAR_LISP ("kbd-macro-termination-hook", Vkbd_macro_termination_hook,
|
||
doc: /* Normal hook run whenever a keyboard macro terminates.
|
||
This is run whether the macro ends normally or prematurely due to an error. */);
|
||
Vkbd_macro_termination_hook = Qnil;
|
||
DEFSYM (Qkbd_macro_termination_hook, "kbd-macro-termination-hook");
|
||
|
||
defsubr (&Sstart_kbd_macro);
|
||
defsubr (&Send_kbd_macro);
|
||
defsubr (&Scall_last_kbd_macro);
|
||
defsubr (&Sexecute_kbd_macro);
|
||
defsubr (&Scancel_kbd_macro_events);
|
||
defsubr (&Sstore_kbd_macro_event);
|
||
|
||
DEFVAR_KBOARD ("defining-kbd-macro", defining_kbd_macro,
|
||
doc: /* Non-nil while a keyboard macro is being defined. Don't set this!
|
||
The value is the symbol `append' while appending to the definition of
|
||
an existing macro. */);
|
||
|
||
DEFVAR_LISP ("executing-kbd-macro", Vexecuting_kbd_macro,
|
||
doc: /* Currently executing keyboard macro (string or vector).
|
||
This is nil when not executing a keyboard macro. */);
|
||
|
||
DEFVAR_INT ("executing-kbd-macro-index", executing_kbd_macro_index,
|
||
doc: /* Index in currently executing keyboard macro; undefined if none executing. */);
|
||
|
||
DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro,
|
||
doc: /* Last kbd macro defined, as a string or vector; nil if none defined. */);
|
||
}
|