diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-08-12 05:07:48 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-08-12 05:07:48 +0000 |
| commit | 1ac9108a3d6f91efbf9dc479af92d0f46faf30a7 (patch) | |
| tree | c239abeed9573b080ab721c44a1afd11705b4177 /src/keyboard.c | |
| parent | cf6e27cf471ef190f74f84659fcea68b38218656 (diff) | |
| download | emacs-1ac9108a3d6f91efbf9dc479af92d0f46faf30a7.tar.gz | |
* cmds.c (nonundocount): New global variable.
(keys_of_cmds): Initialize it.
(Fself_insert_command): Use it to combine upto 20 sequential chars
into a single undo entry, just like the Qself_insert_command code in
keyboard.c does.
Call frame_make_pointer_invisible, also like the Qself_insert_command
code in keyboard.c does.
* keyboard.c (command_loop_1): Use the new global nonundocount rather
than its own local replacement for it.
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index b8714a393ec..a49c6465f41 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1519,12 +1519,13 @@ cancel_hourglass_unwind (arg) } #endif +extern int nonundocount; /* Declared in cmds.c. */ + Lisp_Object command_loop_1 () { Lisp_Object cmd; int lose; - int nonundocount; Lisp_Object keybuf[30]; int i; int prev_modiff = 0; @@ -1540,7 +1541,6 @@ command_loop_1 () waiting_for_input = 0; cancel_echoing (); - nonundocount = 0; this_command_key_count = 0; this_command_key_count_reset = 0; this_single_command_key_start = 0; @@ -1898,7 +1898,7 @@ command_loop_1 () #endif nonundocount = 0; - if (NILP (current_kboard->Vprefix_arg)) + if (NILP (current_kboard->Vprefix_arg)) /* FIXME: Why? --Stef */ Fundo_boundary (); Fcommand_execute (Vthis_command, Qnil, Qnil, Qnil); |