HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Fdefine_key): Doc fix.
[bpt/emacs.git]
/
src
/
macros.c
diff --git
a/src/macros.c
b/src/macros.c
index
44d44d2
..
fb452e4
100644
(file)
--- a/
src/macros.c
+++ b/
src/macros.c
@@
-1,5
+1,6
@@
/* Keyboard macros.
/* Keyboard macros.
- Copyright (C) 1985, 1986, 1993, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-15,8
+16,8
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-Boston, MA 0211
1-1307
, USA. */
+the Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+Boston, MA 0211
0-1301
, USA. */
#include <config.h>
#include <config.h>
@@
-31,25
+32,25
@@
Lisp_Object Qexecute_kbd_macro, Qkbd_macro_termination_hook;
/* Kbd macro currently being executed (a string or vector). */
/* Kbd macro currently being executed (a string or vector). */
-Lisp_Object Vexecuting_macro;
+Lisp_Object Vexecuting_
kbd_
macro;
/* Index of next character to fetch from that macro. */
/* Index of next character to fetch from that macro. */
-EMACS_INT executing_macro_index;
+EMACS_INT executing_
kbd_
macro_index;
/* 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. */
/* 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. */
-int executing_macro_iterations;
+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. */
/* 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_macro;
+Lisp_Object executing_
kbd_
macro;
extern Lisp_Object real_this_command;
extern Lisp_Object real_this_command;
@@
-93,12
+94,10
@@
macro before appending to it. */)
else
{
int i, len;
else
{
int i, len;
+ int cvt;
/* Check the type of last-kbd-macro in case Lisp code changed it. */
/* Check the type of last-kbd-macro in case Lisp code changed it. */
- if (!STRINGP (current_kboard->Vlast_kbd_macro)
- && !VECTORP (current_kboard->Vlast_kbd_macro))
- current_kboard->Vlast_kbd_macro
- = wrong_type_argument (Qarrayp, current_kboard->Vlast_kbd_macro);
+ CHECK_VECTOR_OR_STRING (current_kboard->Vlast_kbd_macro);
len = XINT (Flength (current_kboard->Vlast_kbd_macro));
len = XINT (Flength (current_kboard->Vlast_kbd_macro));
@@
-111,9
+110,17
@@
macro before appending to it. */)
= (Lisp_Object *)xrealloc (current_kboard->kbd_macro_buffer,
(len + 30) * sizeof (Lisp_Object));
}
= (Lisp_Object *)xrealloc (current_kboard->kbd_macro_buffer,
(len + 30) * sizeof (Lisp_Object));
}
+
+ /* Must convert meta modifier when copying string to vector. */
+ cvt = STRINGP (current_kboard->Vlast_kbd_macro);
for (i = 0; i < len; i++)
for (i = 0; i < len; i++)
- current_kboard->kbd_macro_buffer[i]
- = Faref (current_kboard->Vlast_kbd_macro, make_number (i));
+ {
+ Lisp_Object c;
+ c = Faref (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;
current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer + len;
current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr;
@@
-276,17
+283,17
@@
each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
return Qnil;
}
return Qnil;
}
-/* Restore Vexecuting_
macro and executing_macro_index - called when
- the unwind-protect in Fexecute_kbd_macro gets invoked. */
+/* Restore Vexecuting_
kbd_macro and executing_kbd_macro_index.
+
Called when
the unwind-protect in Fexecute_kbd_macro gets invoked. */
static Lisp_Object
pop_kbd_macro (info)
Lisp_Object info;
{
Lisp_Object tem;
static Lisp_Object
pop_kbd_macro (info)
Lisp_Object info;
{
Lisp_Object tem;
- Vexecuting_macro = XCAR (info);
+ Vexecuting_
kbd_
macro = XCAR (info);
tem = XCDR (info);
tem = XCDR (info);
- executing_macro_index = XINT (XCAR (tem));
+ executing_
kbd_
macro_index = XINT (XCAR (tem));
real_this_command = XCDR (tem);
Frun_hooks (1, &Qkbd_macro_termination_hook);
return Qnil;
real_this_command = XCDR (tem);
Frun_hooks (1, &Qkbd_macro_termination_hook);
return Qnil;
@@
-309,7
+316,7
@@
each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
struct gcpro gcpro1, gcpro2;
int success_count = 0;
struct gcpro gcpro1, gcpro2;
int success_count = 0;
- executing_macro_iterations = 0;
+ executing_
kbd_
macro_iterations = 0;
if (!NILP (count))
{
if (!NILP (count))
{
@@
-321,17
+328,17
@@
each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
if (!STRINGP (final) && !VECTORP (final))
error ("Keyboard macros must be strings or vectors");
if (!STRINGP (final) && !VECTORP (final))
error ("Keyboard macros must be strings or vectors");
- tem = Fcons (Vexecuting_macro,
- Fcons (make_number (executing_macro_index),
+ tem = Fcons (Vexecuting_
kbd_
macro,
+ Fcons (make_number (executing_
kbd_
macro_index),
real_this_command));
record_unwind_protect (pop_kbd_macro, tem);
GCPRO2 (final, loopfunc);
do
{
real_this_command));
record_unwind_protect (pop_kbd_macro, tem);
GCPRO2 (final, loopfunc);
do
{
- Vexecuting_macro = final;
- executing_macro = final;
- executing_macro_index = 0;
+ Vexecuting_
kbd_
macro = final;
+ executing_
kbd_
macro = final;
+ executing_
kbd_
macro_index = 0;
current_kboard->Vprefix_arg = Qnil;
current_kboard->Vprefix_arg = Qnil;
@@
-345,16
+352,16
@@
each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
command_loop_1 ();
command_loop_1 ();
- executing_macro_iterations = ++success_count;
+ executing_
kbd_
macro_iterations = ++success_count;
QUIT;
}
while (--repeat
QUIT;
}
while (--repeat
- && (STRINGP (Vexecuting_
macro) || VECTORP (Vexecuting
_macro)));
+ && (STRINGP (Vexecuting_
kbd_macro) || VECTORP (Vexecuting_kbd
_macro)));
- executing_macro = Qnil;
+ executing_
kbd_
macro = Qnil;
- real_this_command = Vexecuting_macro;
+ real_this_command = Vexecuting_
kbd_
macro;
UNGCPRO;
return unbind_to (pdlcount, Qnil);
UNGCPRO;
return unbind_to (pdlcount, Qnil);
@@
-363,8
+370,8
@@
each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
void
init_macros ()
{
void
init_macros ()
{
- Vexecuting_macro = Qnil;
- executing_macro = Qnil;
+ Vexecuting_
kbd_
macro = Qnil;
+ executing_
kbd_
macro = Qnil;
}
void
}
void
@@
-383,17
+390,20
@@
syms_of_macros ()
defsubr (&Sstore_kbd_macro_event);
DEFVAR_KBOARD ("defining-kbd-macro", defining_kbd_macro,
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! */);
+ 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-macro", &Vexecuting_macro,
- doc: /* Currently executing keyboard macro (string or vector); nil if none executing. */);
+ 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-
macro-index", &executing
_macro_index,
+ DEFVAR_INT ("executing-
kbd-macro-index", &executing_kbd
_macro_index,
doc: /* Index in currently executing keyboard macro; undefined if none executing. */);
doc: /* Index in currently executing keyboard macro; undefined if none executing. */);
- DEFVAR_LISP_NOPRO ("executing-kbd-macro", &Vexecuting_macro,
- doc: /* Currently executing keyboard macro (string or vector); nil 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. */);
}
DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro,
doc: /* Last kbd macro defined, as a string or vector; nil if none defined. */);
}
+
+/* arch-tag: d293fcc9-2266-4163-9198-7fa0de12ec9e
+ (do not change this comment) */