From fc8a384f9df20ffeac57585452bb8092b6a76abf Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 10 Oct 2024 12:49:56 +0200 Subject: [PATCH] Tramp: Don't redisplay in `sit-for' * lisp/net/tramp.el (tramp-wait-for-regexp): * lisp/net/tramp-message.el (tramp-error-with-buffer, tramp-user-error): Don't redisplay in `sit-for'. (Bug#73718) (cherry picked from commit 1d137b69040866c3251fc30762299d307ddfc830) --- lisp/net/tramp-message.el | 4 ++-- lisp/net/tramp.el | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/net/tramp-message.el b/lisp/net/tramp-message.el index 788c569327e..3fc93d6d2ff 100644 --- a/lisp/net/tramp-message.el +++ b/lisp/net/tramp-message.el @@ -420,7 +420,7 @@ an input event arrives. The other arguments are passed to `tramp-error'." ;; Show buffer. (pop-to-buffer buf) (discard-input) - (sit-for tramp-error-show-message-timeout))) + (sit-for tramp-error-show-message-timeout 'nodisp))) ;; Reset timestamp. It would be wrong after waiting for a while. (when (tramp-file-name-equal-p vec (car tramp-current-connection)) (setcdr tramp-current-connection (current-time))))))) @@ -441,7 +441,7 @@ an input event arrives. The other arguments are passed to `tramp-error'." ;; `tramp-error' does not show messages. So we must do it ourselves. (apply #'message fmt-string arguments) (discard-input) - (sit-for tramp-error-show-message-timeout) + (sit-for tramp-error-show-message-timeout 'nodisp) ;; Reset timestamp. It would be wrong after waiting for a while. (when (tramp-file-name-equal-p vec-or-proc (car tramp-current-connection)) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 586999aebcb..96717ca6ea8 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2483,7 +2483,7 @@ Fall back to normal file name handler if no Tramp file name handler exists." ;; "process-name" and "process-buffer", ;; because the operations shall be applied ;; in the main connection process. In order - ;; to avoid suspicious debug buffers during + ;; to avoid superfluous debug buffers during ;; host name completion, we adapt ;; `tramp-verbose'. ;; If `non-essential' is non-nil, Tramp shall @@ -6043,7 +6043,7 @@ nil." (with-tramp-timeout (timeout) (while (not found) ;; This is needed to yield the CPU, otherwise we'll see 100% CPU load. - (sit-for 0) + (sit-for 0 'nodisp) (tramp-accept-process-output proc) (unless (process-live-p proc) (tramp-error-with-buffer -- 2.39.5