emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r117240: * net/tramp.el (with-tramp-progress-reporte


From: Michael Albinus
Subject: [Emacs-diffs] trunk r117240: * net/tramp.el (with-tramp-progress-reporter): Remove traces.
Date: Mon, 02 Jun 2014 18:36:54 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117240
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2014-06-02 20:36:47 +0200
message:
  * net/tramp.el (with-tramp-progress-reporter): Remove traces.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp.el              tramp.el-20091113204419-o5vbwnq5f7feedwu-2427
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-02 15:17:39 +0000
+++ b/lisp/ChangeLog    2014-06-02 18:36:47 +0000
@@ -1,7 +1,6 @@
 2014-06-02  Michael Albinus  <address@hidden>
 
-       * 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  <address@hidden>

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2014-06-02 15:17:39 +0000
+++ b/lisp/net/tramp.el 2014-06-02 18:36:47 +0000
@@ -1673,18 +1673,10 @@
                                  #'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\\>"))


reply via email to

[Prev in Thread] Current Thread [Next in Thread]