* net/tramp.el (with-tramp-progress-reporter): Remove traces.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dff574972a48cc717b836927d2bfcf6680a5e1a2..d62169188434e76a0e0cb4c3b74b9854b795e54d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,6 @@
 2014-06-02  Michael Albinus  <michael.albinus@gmx.de>
 
-       * net/tramp.el (with-tramp-progress-reporter, tramp-call-process):
-       Add traces.
+       * net/tramp.el (tramp-call-process): Add traces.
        (tramp-handle-unhandled-file-name-directory): Return "/".
 
 2014-06-02  Wilson Snyder  <wsnyder@wsnyder.org>

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 36ee449659c679e0a2871b3599652cd0a9696f56..116db733865904e3a15dd9b3a9839c261d7d3619 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1673,18 +1673,10 @@ without a visible progress reporter."
                                  #'tramp-progress-reporter-update pr)))))))
        (unwind-protect
            ;; Execute the body.
-           (prog1
-              (condition-case err
-                  (progn ,@body)
-                (error
-                 (tramp-message ,vec 6 "%s" (error-message-string err))
-                 ;; Propagate the error.
-                 (signal (car err) (cdr err))))
-            (setq cookie "done"))
+           (prog1 (progn ,@body) (setq cookie "done"))
          ;; Stop progress reporter.
          (if tm (tramp-compat-funcall 'cancel-timer tm))
-         (tramp-message ,vec ,level "%s...%s" ,message cookie)
-        (when (string-equal "failed" cookie) (tramp-backtrace ,vec))))))
+         (tramp-message ,vec ,level "%s...%s" ,message cookie)))))
 
 (tramp-compat-font-lock-add-keywords
  'emacs-lisp-mode '("\\<with-tramp-progress-reporter\\>"))