diff options
| author | Michael Albinus | 2014-06-02 16:17:07 +0200 |
|---|---|---|
| committer | Michael Albinus | 2014-06-02 16:17:07 +0200 |
| commit | fd9fba8bd3bcf457a84726b8451edece7a603d6e (patch) | |
| tree | f90e3ab5719457c523e86ae5234528e051533022 | |
| parent | bcb1a5bacd49eb8f27db1b33a867d949ba249b0e (diff) | |
| download | emacs-fd9fba8bd3bcf457a84726b8451edece7a603d6e.tar.gz emacs-fd9fba8bd3bcf457a84726b8451edece7a603d6e.zip | |
* net/tramp.el (with-tramp-progress-reporter): Complete previous patch.
| -rw-r--r-- | lisp/net/tramp.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index d5678d826b6..deb89ed5894 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -1676,7 +1676,10 @@ without a visible progress reporter." | |||
| 1676 | (prog1 | 1676 | (prog1 |
| 1677 | (condition-case err | 1677 | (condition-case err |
| 1678 | (progn ,@body) | 1678 | (progn ,@body) |
| 1679 | (error (tramp-message ,vec 6 "%s" (error-message-string err)))) | 1679 | (error |
| 1680 | (tramp-message ,vec 6 "%s" (error-message-string err)) | ||
| 1681 | ;; Propagate the error. | ||
| 1682 | (signal (car err) (cdr err)))) | ||
| 1680 | (setq cookie "done")) | 1683 | (setq cookie "done")) |
| 1681 | ;; Stop progress reporter. | 1684 | ;; Stop progress reporter. |
| 1682 | (if tm (tramp-compat-funcall 'cancel-timer tm)) | 1685 | (if tm (tramp-compat-funcall 'cancel-timer tm)) |