From: Michael Albinus Date: Mon, 2 Jun 2014 18:36:47 +0000 (+0200) Subject: * net/tramp.el (with-tramp-progress-reporter): Remove traces. X-Git-Tag: emacs-25.0.90~2639^2~141 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e915914b937f0190d77fc1490dfd7b543dd3c217;p=emacs.git * net/tramp.el (with-tramp-progress-reporter): Remove traces. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dff574972a4..d6216918843 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,6 @@ 2014-06-02 Michael Albinus - * 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 diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 36ee449659c..116db733865 100644 --- 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 '("\\"))