aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2018-12-02 09:39:04 +0200
committerEli Zaretskii2018-12-02 09:39:04 +0200
commitc418c85617babbe7b63730fefb71e2c87a0141af (patch)
tree1ea96ccd6d254e991fc86f9a786cfadd342e548e /src
parent8fa0d9679d25c431bfe2da3d93997f5ed222ce35 (diff)
downloademacs-c418c85617babbe7b63730fefb71e2c87a0141af.tar.gz
emacs-c418c85617babbe7b63730fefb71e2c87a0141af.zip
Revert "Fix infloop in GC mark_kboards"
This reverts commit af914fc26db273d8788e7efa57c569f0f778d037, since it caused unintended adverse effects on echoing of keys. (Bug#33571)
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index dccc6b7f128..0d56ea3f7ac 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12011,12 +12011,7 @@ mark_kboards (void)
12011 for (event = kbd_fetch_ptr; event != kbd_store_ptr; event++) 12011 for (event = kbd_fetch_ptr; event != kbd_store_ptr; event++)
12012 { 12012 {
12013 if (event == kbd_buffer + KBD_BUFFER_SIZE) 12013 if (event == kbd_buffer + KBD_BUFFER_SIZE)
12014 { 12014 event = kbd_buffer;
12015 event = kbd_buffer;
12016 if (event == kbd_store_ptr)
12017 break;
12018 }
12019
12020 /* These two special event types has no Lisp_Objects to mark. */ 12015 /* These two special event types has no Lisp_Objects to mark. */
12021 if (event->kind != SELECTION_REQUEST_EVENT 12016 if (event->kind != SELECTION_REQUEST_EVENT
12022 && event->kind != SELECTION_CLEAR_EVENT) 12017 && event->kind != SELECTION_CLEAR_EVENT)