emacs/gnu.emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2026-09-10 15:56:35 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport: Fix 'with-tramp-progress-reporter' (bug#81455)

Browse source 
Clear stateful progress reporters like 'system-taskbar'.

* lisp/net/tramp.el (with-tramp-progress-reporter): Call
'progress-reporter-done' in 'unwind-protect'.

(cherry picked from commit 1f9a492aea)
This commit is contained in:
Stéphane Marks 2026-07-22 17:03:23 -04:00 committed by Michael Albinus
parent 2771f99c72
commit 0448b4e09a
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/net/tramp.el
View file

@ -2235,15 +2235,16 @@ without a visible progress reporter."
`(if (or noninteractive inhibit-message)
(progn ,@body)
(tramp-message ,vec ,level "%s..." ,message)
(let ((cookie "failed")
(tm
;; We start a pulsing progress reporter after 3 seconds.
;; Start only when there is no other progress reporter
;; running, and when there is a minimum level.
(when-let* ((pr (and (null tramp-inhibit-progress-reporter)
(<= ,level (min tramp-verbose 3))
(make-progress-reporter ,message))))
(run-at-time 3 0.1 #'tramp-progress-reporter-update pr))))
(let* ((cookie "failed")
(pr (and (null tramp-inhibit-progress-reporter)
(<= ,level (min tramp-verbose 3))
(make-progress-reporter ,message)))
(tm
;; We start a pulsing progress reporter after 3 seconds.
;; Start only when there is no other progress reporter
;; running, and when there is a minimum level.
(when pr
(run-at-time 3 0.1 #'tramp-progress-reporter-update pr))))
(unwind-protect
;; Execute the body.
(prog1
@ -2253,7 +2254,8 @@ without a visible progress reporter."
,@body)
(setq cookie "done"))
;; Stop progress reporter.
(if tm (cancel-timer tm))
(when tm (cancel-timer tm))
(when pr (progress-reporter-done pr))
(tramp-message ,vec ,level "%s...%s" ,message cookie)))))
(defmacro with-tramp-timeout (list &rest body)