aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2013-07-10 17:18:39 +0200
committerMichael Albinus2013-07-10 17:18:39 +0200
commit500dd7a35d5a4a444f45da036f43cdbbc3bcbbd0 (patch)
tree4520375f99246ef34da26b02c6c9971a66431963
parent525c5c7704d217dac5aae8f3730f4a31b5603be8 (diff)
downloademacs-500dd7a35d5a4a444f45da036f43cdbbc3bcbbd0.tar.gz
emacs-500dd7a35d5a4a444f45da036f43cdbbc3bcbbd0.zip
Fix last patch.
-rw-r--r--lisp/net/tramp.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 6b2e20a0dae..6c5fd5e5dd4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1600,7 +1600,7 @@ If LEVEL does not fit for visible messages, or if this is a
1600nested call of the macro, there are only traces without a visible 1600nested call of the macro, there are only traces without a visible
1601progress reporter." 1601progress reporter."
1602 (declare (indent 3) (debug t)) 1602 (declare (indent 3) (debug t))
1603 `(let (pr tm) 1603 `(let (pr tm result)
1604 (tramp-message ,vec ,level "%s..." ,message) 1604 (tramp-message ,vec ,level "%s..." ,message)
1605 ;; We start a pulsing progress reporter after 3 seconds. Feature 1605 ;; We start a pulsing progress reporter after 3 seconds. Feature
1606 ;; introduced in Emacs 24.1. 1606 ;; introduced in Emacs 24.1.
@@ -1614,7 +1614,7 @@ progress reporter."
1614 (condition-case err 1614 (condition-case err
1615 (unwind-protect 1615 (unwind-protect
1616 ;; Execute the body. 1616 ;; Execute the body.
1617 (progn ,@body) 1617 (setq result (progn ,@body))
1618 ;; Stop progress reporter. 1618 ;; Stop progress reporter.
1619 (if tm (tramp-compat-funcall 'cancel-timer tm))) 1619 (if tm (tramp-compat-funcall 'cancel-timer tm)))
1620 1620
@@ -1624,7 +1624,8 @@ progress reporter."
1624 (signal (car err) (cdr err)))) 1624 (signal (car err) (cdr err))))
1625 1625
1626 ;; Exit. 1626 ;; Exit.
1627 (tramp-message ,vec ,level "%s...done" ,message))) 1627 (tramp-message ,vec ,level "%s...done" ,message)
1628 result))
1628 1629
1629(tramp-compat-font-lock-add-keywords 1630(tramp-compat-font-lock-add-keywords
1630 'emacs-lisp-mode '("\\<with-tramp-progress-reporter\\>")) 1631 'emacs-lisp-mode '("\\<with-tramp-progress-reporter\\>"))