[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 385a02cffde 2/7: * src/keyboard.c (requeued_events_pending_p): Im
From: |
Stefan Monnier |
Subject: |
master 385a02cffde 2/7: * src/keyboard.c (requeued_events_pending_p): Improve name and fix comment |
Date: |
Sun, 10 Mar 2024 10:48:12 -0400 (EDT) |
branch: master
commit 385a02cffde6d0fd80ff189704ad70cfebc3e8d4
Author: Tim Ruffing <crypto@timruffing.de>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* src/keyboard.c (requeued_events_pending_p): Improve name and fix comment
* src/keyboard.c, src/keyboard.h (requeued_events_pending_p): Rename to
'requeued_command_events_pending_p' to clarify that the function covers
only command events. Fix wrong comment that claimed that the function
was unused.
* src/process.c (wait_reading_process_output): Update caller to use the
new name.
---
src/keyboard.c | 8 ++------
src/keyboard.h | 2 +-
src/process.c | 8 ++++----
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/keyboard.c b/src/keyboard.c
index b6fc568cde5..e5efde4ef53 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11565,14 +11565,10 @@ clear_input_pending (void)
input_pending = false;
}
-/* Return true if there are pending requeued events.
- This isn't used yet. The hope is to make wait_reading_process_output
- call it, and return if it runs Lisp code that unreads something.
- The problem is, kbd_buffer_get_event needs to be fixed to know what
- to do in that case. It isn't trivial. */
+/* Return true if there are pending requeued command events. */
bool
-requeued_events_pending_p (void)
+requeued_command_events_pending_p (void)
{
return (CONSP (Vunread_command_events));
}
diff --git a/src/keyboard.h b/src/keyboard.h
index 68e68bc2ae3..600aaf11517 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -483,7 +483,7 @@ extern void set_poll_suppress_count (int);
extern int gobble_input (void);
extern bool input_polling_used (void);
extern void clear_input_pending (void);
-extern bool requeued_events_pending_p (void);
+extern bool requeued_command_events_pending_p (void);
extern void bind_polling_period (int);
extern int make_ctrl_char (int) ATTRIBUTE_CONST;
extern void stuff_buffered_input (Lisp_Object);
diff --git a/src/process.c b/src/process.c
index 48a2c0c8e53..6b8b483cdf7 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5439,7 +5439,7 @@ wait_reading_process_output (intmax_t time_limit, int
nsecs, int read_kbd,
/* If there is unread keyboard input, also return. */
if (read_kbd != 0
- && requeued_events_pending_p ())
+ && requeued_command_events_pending_p ())
break;
/* This is so a breakpoint can be put here. */
@@ -5849,7 +5849,7 @@ wait_reading_process_output (intmax_t time_limit, int
nsecs, int read_kbd,
/* If there is unread keyboard input, also return. */
if (read_kbd != 0
- && requeued_events_pending_p ())
+ && requeued_command_events_pending_p ())
break;
/* If we are not checking for keyboard input now,
@@ -8036,7 +8036,7 @@ wait_reading_process_output (intmax_t time_limit, int
nsecs, int read_kbd,
/* If there is unread keyboard input, also return. */
if (read_kbd != 0
- && requeued_events_pending_p ())
+ && requeued_command_events_pending_p ())
break;
if (timespec_valid_p (timer_delay))
@@ -8109,7 +8109,7 @@ wait_reading_process_output (intmax_t time_limit, int
nsecs, int read_kbd,
/* If there is unread keyboard input, also return. */
if (read_kbd
- && requeued_events_pending_p ())
+ && requeued_command_events_pending_p ())
break;
/* If wait_for_cell. check for keyboard input
- master updated (f3da3d1c68b -> 2fdb281a276), Stefan Monnier, 2024/03/10
- master d444390ec56 5/7: Remove workarounds for solved 'read-event' bug, Stefan Monnier, 2024/03/10
- master 385a02cffde 2/7: * src/keyboard.c (requeued_events_pending_p): Improve name and fix comment,
Stefan Monnier <=
- master 2fdb281a276 7/7: * src/keyboard.c (read_key_sequence): Remove MSVC compatibility hack, Stefan Monnier, 2024/03/10
- master df3e0bcbdbc 6/7: * lisp/calc/calc-prog.el: Switch to new method of detecting end of kbd macro, Stefan Monnier, 2024/03/10
- master fbc5fb2561d 1/7: Extract check for end of macro to function, Stefan Monnier, 2024/03/10
- master d6f326452ec 3/7: * src/keyboard.c (requeued_events_pending_p): New function, Stefan Monnier, 2024/03/10
- master 6f46dd516b8 4/7: Continue reading in 'read-event' etc. at the end of a keyboard macro, Stefan Monnier, 2024/03/10