From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 10 Jul 2013 15:18:39 +0000 (+0200)
Subject: Fix last patch.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1855
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=500dd7a35d5a4a444f45da036f43cdbbc3bcbbd0;p=emacs.git

Fix last patch.
---

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
 nested call of the macro, there are only traces without a visible
 progress reporter."
   (declare (indent 3) (debug t))
-  `(let (pr tm)
+  `(let (pr tm result)
      (tramp-message ,vec ,level "%s..." ,message)
      ;; We start a pulsing progress reporter after 3 seconds.  Feature
      ;; introduced in Emacs 24.1.
@@ -1614,7 +1614,7 @@ progress reporter."
      (condition-case err
 	 (unwind-protect
 	     ;; Execute the body.
-	     (progn  ,@body)
+	     (setq result (progn ,@body))
 	   ;; Stop progress reporter.
 	   (if tm (tramp-compat-funcall 'cancel-timer tm)))
 
@@ -1624,7 +1624,8 @@ progress reporter."
 	(signal (car err) (cdr err))))
 
      ;; Exit.
-     (tramp-message ,vec ,level "%s...done" ,message)))
+     (tramp-message ,vec ,level "%s...done" ,message)
+     result))
 
 (tramp-compat-font-lock-add-keywords
  'emacs-lisp-mode '("\\<with-tramp-progress-reporter\\>"))