Commit 500dd7a3 authored by Michael Albinus's avatar Michael Albinus

Fix last patch.

parent 525c5c77
...@@ -1600,7 +1600,7 @@ If LEVEL does not fit for visible messages, or if this is a ...@@ -1600,7 +1600,7 @@ If LEVEL does not fit for visible messages, or if this is a
nested call of the macro, there are only traces without a visible nested call of the macro, there are only traces without a visible
progress reporter." progress reporter."
(declare (indent 3) (debug t)) (declare (indent 3) (debug t))
`(let (pr tm) `(let (pr tm result)
(tramp-message ,vec ,level "%s..." ,message) (tramp-message ,vec ,level "%s..." ,message)
;; We start a pulsing progress reporter after 3 seconds. Feature ;; We start a pulsing progress reporter after 3 seconds. Feature
;; introduced in Emacs 24.1. ;; introduced in Emacs 24.1.
...@@ -1614,7 +1614,7 @@ progress reporter." ...@@ -1614,7 +1614,7 @@ progress reporter."
(condition-case err (condition-case err
(unwind-protect (unwind-protect
;; Execute the body. ;; Execute the body.
(progn ,@body) (setq result (progn ,@body))
;; Stop progress reporter. ;; Stop progress reporter.
(if tm (tramp-compat-funcall 'cancel-timer tm))) (if tm (tramp-compat-funcall 'cancel-timer tm)))
...@@ -1624,7 +1624,8 @@ progress reporter." ...@@ -1624,7 +1624,8 @@ progress reporter."
(signal (car err) (cdr err)))) (signal (car err) (cdr err))))
;; Exit. ;; Exit.
(tramp-message ,vec ,level "%s...done" ,message))) (tramp-message ,vec ,level "%s...done" ,message)
result))
(tramp-compat-font-lock-add-keywords (tramp-compat-font-lock-add-keywords
'emacs-lisp-mode '("\\<with-tramp-progress-reporter\\>")) 'emacs-lisp-mode '("\\<with-tramp-progress-reporter\\>"))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment