[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2fdb281a276 7/7: * src/keyboard.c (read_key_sequence): Remove MSV
From: |
Stefan Monnier |
Subject: |
master 2fdb281a276 7/7: * src/keyboard.c (read_key_sequence): Remove MSVC compatibility hack |
Date: |
Sun, 10 Mar 2024 10:48:13 -0400 (EDT) |
branch: master
commit 2fdb281a276af57c104008d68ae95c7f4b1c3da8
Author: Tim Ruffing <crypto@timruffing.de>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* src/keyboard.c (read_key_sequence): Remove MSVC compatibility hack
---
src/keyboard.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/keyboard.c b/src/keyboard.c
index cadb376430e..1ba74a59537 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10442,9 +10442,6 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object
prompt,
Lisp_Object original_uppercase UNINIT;
int original_uppercase_position = -1;
- /* Gets around Microsoft compiler limitations. */
- bool dummyflag = false;
-
#ifdef HAVE_TEXT_CONVERSION
bool disabled_conversion;
@@ -10693,10 +10690,7 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object
prompt,
&& !requeued_events_pending_p ())
{
t = 0;
- /* The Microsoft C compiler can't handle the goto that
- would go here. */
- dummyflag = true;
- break;
+ goto done;
}
/* Otherwise, we should actually read a character. */
else
@@ -11291,10 +11285,7 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object
prompt,
&& help_char_p (EVENT_HEAD (key)) && t > 1)
{
read_key_sequence_cmd = Vprefix_help_command;
- /* The Microsoft C compiler can't handle the goto that
- would go here. */
- dummyflag = true;
- break;
+ goto done;
}
/* If KEY is not defined in any of the keymaps,
@@ -11343,8 +11334,9 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object
prompt,
}
}
}
- if (!dummyflag)
- read_key_sequence_cmd = current_binding;
+ read_key_sequence_cmd = current_binding;
+
+ done:
read_key_sequence_remapped
/* Remap command through active keymaps.
Do the remapping here, before the unbind_to so it uses the keymaps
- 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, 2024/03/10
- master 2fdb281a276 7/7: * src/keyboard.c (read_key_sequence): Remove MSVC compatibility hack,
Stefan Monnier <=
- 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