diff options
| author | Luc Teirlinck | 2005-05-01 20:04:11 +0000 |
|---|---|---|
| committer | Luc Teirlinck | 2005-05-01 20:04:11 +0000 |
| commit | bec0b768694180802a832c870af052dec0ac27b3 (patch) | |
| tree | 60fa8a1b893215b4c0c46974ad0b1fcc480d785e /src | |
| parent | ebbfa918dea6349b0729e24d87d670a115a81231 (diff) | |
| download | emacs-bec0b768694180802a832c870af052dec0ac27b3.tar.gz emacs-bec0b768694180802a832c870af052dec0ac27b3.zip | |
(sit_for): Vexecuting_macro -> Vexecuting_kbd_macro.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/dispnew.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 013b04eb811..b0a2f344e2e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2005-05-01 Luc Teirlinck <teirllm@auburn.edu> | ||
| 2 | |||
| 3 | * dispnew.c (sit_for): Vexecuting_macro -> Vexecuting_kbd_macro. | ||
| 4 | |||
| 1 | 2005-05-01 Richard M. Stallman <rms@gnu.org> | 5 | 2005-05-01 Richard M. Stallman <rms@gnu.org> |
| 2 | 6 | ||
| 3 | * xmenu.c [not HAVE_X_TOOLKIT] (xmenu_show): | 7 | * xmenu.c [not HAVE_X_TOOLKIT] (xmenu_show): |
diff --git a/src/dispnew.c b/src/dispnew.c index 4ebc1461926..6d851ba8471 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -6357,7 +6357,7 @@ sit_for (sec, usec, reading, display, initial_display) | |||
| 6357 | { | 6357 | { |
| 6358 | swallow_events (display); | 6358 | swallow_events (display); |
| 6359 | 6359 | ||
| 6360 | if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_macro)) | 6360 | if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_kbd_macro)) |
| 6361 | return Qnil; | 6361 | return Qnil; |
| 6362 | 6362 | ||
| 6363 | if (initial_display) | 6363 | if (initial_display) |