From 9fbff9c35cb4a6c5099178d6c712690ea4614d6a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 30 Nov 2020 20:42:06 +0200 Subject: [PATCH 1/3] ; * src/buffer.c: Fix comment describing 'buffer_defaults'. --- src/buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 5433c80edb0..f252f3d7ebf 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -67,8 +67,9 @@ struct buffer buffer_defaults; /* This structure marks which slots in a buffer have corresponding default values in buffer_defaults. - Each such slot has a nonzero value in this structure. - The value has only one nonzero bit. + Each such slot has a value in this structure. + The value is a positive Lisp integer that must be smaller than + MAX_PER_BUFFER_VARS. When a buffer has its own local value for a slot, the entry for that slot (found in the same slot in this structure) From 3e6525d69f0de68fe2305f8e2102c8a5ce42f671 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 30 Nov 2020 20:44:11 +0200 Subject: [PATCH 2/3] Don't show in 'view-lossage' responses to xterm feature queries * lisp/term/xterm.el (xterm--read-event-for-query): Prevent recording the characters read as the xterm response to a query, so as not to show them in 'view-lossage'. (Bug#44908) --- lisp/term/xterm.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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\".") By not redisplaying right away for xterm queries, we can avoid unsightly flashing during initialization. Give up and redisplay anyway if we've been waiting a little while." - (let ((start-time (current-time))) + (let ((start-time (current-time)) + (inhibit--record-char t)) (or (let ((inhibit-redisplay t)) (read-event nil nil xterm-query-redisplay-timeout)) (read-event nil nil From 749e4b7e0b04948f4805455e9505c6b855a84c96 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Tue, 1 Dec 2020 03:46:27 +0200 Subject: [PATCH 3/3] Reset xref-show-xrefs-function temporarily * lisp/dired-aux.el (dired-do-find-regexp-and-replace): Make sure xref-show-xrefs-function has the necessary value (bug#44905). --- lisp/dired-aux.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 7f988540c2c..18fb4b0b8b0 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -3023,7 +3023,13 @@ REGEXP should use constructs supported by your local `grep' command." (query-replace-read-args "Query replace regexp in marked files" t t))) (list (nth 0 common) (nth 1 common)))) - (with-current-buffer (dired-do-find-regexp from) + (require 'xref) + (defvar xref-show-xrefs-function) + (with-current-buffer + (let ((xref-show-xrefs-function + ;; Some future-proofing (bug#44905). + (eval (car (get 'xref-show-xrefs-function 'standard-value))))) + (dired-do-find-regexp from)) (xref-query-replace-in-results from to))) (defun dired-nondirectory-p (file)