diff options
| author | Michael Albinus | 2015-08-24 13:40:05 +0200 |
|---|---|---|
| committer | Michael Albinus | 2015-08-24 13:40:05 +0200 |
| commit | 1c6bdf18c0f2116edef7f7195ca5ed7a55a05e73 (patch) | |
| tree | 9fc80dbf79526d2f77646586dfb26854fd8a8b6e | |
| parent | 13b257b083ea43fae8b178d1d43e901c12be2c7e (diff) | |
| download | emacs-1c6bdf18c0f2116edef7f7195ca5ed7a55a05e73.tar.gz emacs-1c6bdf18c0f2116edef7f7195ca5ed7a55a05e73.zip | |
Revert fbb5531fa11d13854b274d28ccd329c9b6652cfc for tramp.el.
| -rw-r--r-- | lisp/net/tramp.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 69d7e1fe613..193d70b230a 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -1504,7 +1504,7 @@ ARGUMENTS to actually emit the message (if applicable)." | |||
| 1504 | ; (1+ (count-lines (point-min) (cdr ffn))))))) | 1504 | ; (1+ (count-lines (point-min) (cdr ffn))))))) |
| 1505 | (insert (format "%s " fn))) | 1505 | (insert (format "%s " fn))) |
| 1506 | ;; The message. | 1506 | ;; The message. |
| 1507 | (insert (apply #'format-message fmt-string arguments)))) | 1507 | (insert (apply 'format fmt-string arguments)))) |
| 1508 | 1508 | ||
| 1509 | (defvar tramp-message-show-message t | 1509 | (defvar tramp-message-show-message t |
| 1510 | "Show Tramp message in the minibuffer. | 1510 | "Show Tramp message in the minibuffer. |
| @@ -1581,8 +1581,8 @@ signal identifier to be raised, remaining arguments passed to | |||
| 1581 | (error-message-string | 1581 | (error-message-string |
| 1582 | (list signal | 1582 | (list signal |
| 1583 | (get signal 'error-message) | 1583 | (get signal 'error-message) |
| 1584 | (apply #'format-message fmt-string arguments))))) | 1584 | (apply 'format fmt-string arguments))))) |
| 1585 | (signal signal (list (apply #'format-message fmt-string arguments))))) | 1585 | (signal signal (list (apply 'format fmt-string arguments))))) |
| 1586 | 1586 | ||
| 1587 | (defsubst tramp-error-with-buffer | 1587 | (defsubst tramp-error-with-buffer |
| 1588 | (buf vec-or-proc signal fmt-string &rest arguments) | 1588 | (buf vec-or-proc signal fmt-string &rest arguments) |
| @@ -3599,8 +3599,8 @@ connection buffer." | |||
| 3599 | "Tramp failed to connect. If this happens repeatedly, try\n" | 3599 | "Tramp failed to connect. If this happens repeatedly, try\n" |
| 3600 | " `\\[tramp-cleanup-this-connection]'"))) | 3600 | " `\\[tramp-cleanup-this-connection]'"))) |
| 3601 | ((eq exit 'timeout) | 3601 | ((eq exit 'timeout) |
| 3602 | (format-message | 3602 | (format |
| 3603 | "Timeout reached, see buffer ‘%s’ for details" | 3603 | "Timeout reached, see buffer `%s' for details" |
| 3604 | (tramp-get-connection-buffer vec))) | 3604 | (tramp-get-connection-buffer vec))) |
| 3605 | (t "Login failed"))))) | 3605 | (t "Login failed"))))) |
| 3606 | (when (numberp pos) | 3606 | (when (numberp pos) |