[Emacs-diffs] trunk r113358: Fix last patch.

[Michael Albinus]

------------------------------------------------------------
revno: 113358
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2013-07-10 17:18:39 +0200
message:
  Fix last patch.
modified:
  lisp/net/tramp.el              tramp.el-20091113204419-o5vbwnq5f7feedwu-2427

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2013-07-10 14:58:26 +0000
+++ b/lisp/net/tramp.el 2013-07-10 15:18:39 +0000
@@ -1600,7 +1600,7 @@
 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 @@
      (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 @@
        (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\\>"))