[Emacs-diffs] trunk r117231: * net/tramp.el (with-tramp-progress-reporter, tramp-call-process):

[Michael Albinus]

------------------------------------------------------------
revno: 117231
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2014-06-02 15:51:35 +0200
message:
  * net/tramp.el (with-tramp-progress-reporter, tramp-call-process):
  Add 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 09:58:50 +0000
+++ b/lisp/ChangeLog    2014-06-02 13:51:35 +0000
@@ -1,6 +1,7 @@
 2014-06-02  Michael Albinus  <address@hidden>
 
-       * net/tramp.el (tramp-call-process): Add traces.
+       * net/tramp.el (with-tramp-progress-reporter, tramp-call-process):
+       Add traces.
 
 2014-06-02  Wilson Snyder  <address@hidden>
 

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2014-06-02 11:35:40 +0000
+++ b/lisp/net/tramp.el 2014-06-02 13:51:35 +0000
@@ -1676,7 +1676,8 @@
            (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)))))
+         (tramp-message ,vec ,level "%s...%s" ,message cookie)
+        (when (string-equal "failed" cookie) (tramp-backtrace ,vec))))))
 
 (tramp-compat-font-lock-add-keywords
  'emacs-lisp-mode '("\\<with-tramp-progress-reporter\\>"))
@@ -4128,13 +4129,17 @@
     (tramp-message
      v 6 "`%s %s' %s %s"
      program (mapconcat 'identity args " ") infile destination)
-    (with-temp-buffer
-      (setq result
-           (apply
-            'call-process program infile (or destination t) display args))
-      (with-current-buffer
-         (if (bufferp destination) destination (current-buffer))
-       (tramp-message v 6 "%d\n%s" result (buffer-string))))
+    (condition-case err
+       (with-temp-buffer
+         (setq result
+               (apply
+                'call-process program infile (or destination t) display args))
+         (with-current-buffer
+             (if (bufferp destination) destination (current-buffer))
+           (tramp-message v 6 "%d\n%s" result (buffer-string))))
+      (error
+       (setq result 1)
+       (tramp-message v 6 "%d\n%s" result (error-message-string err))))
     result))
 
 ;;;###tramp-autoload