aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/term
diff options
context:
space:
mode:
authorGlenn Morris2020-12-01 07:50:12 -0800
committerGlenn Morris2020-12-01 07:50:12 -0800
commit45f0fef718a77dfcef105fb7a44c7422b44d5db1 (patch)
tree16bfa15c4309ea6184e94bc50669928638973760 /lisp/term
parent23d206b03b20e0221ab34e32a93ee910177bcd46 (diff)
parent749e4b7e0b04948f4805455e9505c6b855a84c96 (diff)
downloademacs-45f0fef718a77dfcef105fb7a44c7422b44d5db1.tar.gz
emacs-45f0fef718a77dfcef105fb7a44c7422b44d5db1.zip
Merge from origin/emacs-27
749e4b7e0b Reset xref-show-xrefs-function temporarily 3e6525d69f Don't show in 'view-lossage' responses to xterm feature qu... 9fbff9c35c ; * src/buffer.c: Fix comment describing 'buffer_defaults'.
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/xterm.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 1a727e3933e..709410064b1 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -767,7 +767,8 @@ Can be nil to mean \"no timeout\".")
767By not redisplaying right away for xterm queries, we can avoid 767By not redisplaying right away for xterm queries, we can avoid
768unsightly flashing during initialization. Give up and redisplay 768unsightly flashing during initialization. Give up and redisplay
769anyway if we've been waiting a little while." 769anyway if we've been waiting a little while."
770 (let ((start-time (current-time))) 770 (let ((start-time (current-time))
771 (inhibit--record-char t))
771 (or (let ((inhibit-redisplay t)) 772 (or (let ((inhibit-redisplay t))
772 (read-event nil nil xterm-query-redisplay-timeout)) 773 (read-event nil nil xterm-query-redisplay-timeout))
773 (read-event nil nil 774 (read-event nil nil