From 305aca0a0abbac1011980e6ac9b166bd0dfd6ff0 Mon Sep 17 00:00:00 2001
From: Chris Feng
Date: Wed, 8 Nov 2017 00:39:43 +0800
Subject: Backport: Handle unread-command-events consistently (bug#23980)

* src/keyboard.c (read_char): Events put into `unread-command-events'
with the form (t . EVENT) should always have the t stripped when read
out.
* test/src/keyboard-tests.el: New tests for `unread-command-events'.

(cherry picked from commit 1f3f4b1296613b8cdc0632a68fde86e86ddad866)
---
 src/keyboard.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/keyboard.c b/src/keyboard.c
index dccc6b7f128..d20557b45d7 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2809,6 +2809,9 @@ read_char (int commandflag, Lisp_Object map,
 
       if (EQ (c, make_number (-2)))
 	return c;
+
+      if (CONSP (c) && EQ (XCAR (c), Qt))
+	c = XCDR (c);
   }
 
  non_reread:
-- 
cgit v1.2.1