Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
6b657e42
Commit
6b657e42
authored
Aug 05, 2006
by
Eli Zaretskii
Browse files
(kbd_buffer_get_event): Return Qnil when current time is exactly equal to
end_time, not only when it is past that.
parent
a1ebfe34
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
src/ChangeLog
src/ChangeLog
+5
-0
src/keyboard.c
src/keyboard.c
+8
-6
No files found.
src/ChangeLog
View file @
6b657e42
2006-08-05 Eli Zaretskii <eliz@gnu.org>
* keyboard.c (kbd_buffer_get_event): Return Qnil when current time
is exactly equal to end_time, not only when it is past that.
2006-08-04 Chong Yidong <cyd@stupidchicken.com>
* keyboard.c (read_char): Rebalance specpdl after receiving jump.
...
...
src/keyboard.c
View file @
6b657e42
...
...
@@ -3954,13 +3954,15 @@ kbd_buffer_get_event (kbp, used_mouse_menu, end_time)
{
EMACS_TIME duration;
EMACS_GET_TIME (duration);
EMACS_SUB_TIME (duration, *end_time, duration);
if (EMACS_TIME_NEG_P (duration))
return Qnil;
if (EMACS_TIME_GE (duration, *end_time))
return Qnil; /* finished waiting */
else
wait_reading_process_output (EMACS_SECS (duration),
EMACS_USECS (duration),
-1, 1, Qnil, NULL, 0);
{
EMACS_SUB_TIME (duration, *end_time, duration);
wait_reading_process_output (EMACS_SECS (duration),
EMACS_USECS (duration),
-1, 1, Qnil, NULL, 0);
}
}
else
wait_reading_process_output (0, 0, -1, 1, Qnil, NULL, 0);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment