[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1c6bdf1: Revert fbb5531fa11d13854b274d28ccd329c9b66
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 1c6bdf1: Revert fbb5531fa11d13854b274d28ccd329c9b6652cfc for tramp.el. |
Date: |
Mon, 24 Aug 2015 11:40:19 +0000 |
branch: master
commit 1c6bdf18c0f2116edef7f7195ca5ed7a55a05e73
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Revert fbb5531fa11d13854b274d28ccd329c9b6652cfc for tramp.el.
---
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 69d7e1f..193d70b 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1504,7 +1504,7 @@ ARGUMENTS to actually emit the message (if applicable)."
; (1+ (count-lines (point-min) (cdr ffn)))))))
(insert (format "%s " fn)))
;; The message.
- (insert (apply #'format-message fmt-string arguments))))
+ (insert (apply 'format fmt-string arguments))))
(defvar tramp-message-show-message t
"Show Tramp message in the minibuffer.
@@ -1581,8 +1581,8 @@ signal identifier to be raised, remaining arguments
passed to
(error-message-string
(list signal
(get signal 'error-message)
- (apply #'format-message fmt-string arguments)))))
- (signal signal (list (apply #'format-message fmt-string arguments)))))
+ (apply 'format fmt-string arguments)))))
+ (signal signal (list (apply 'format fmt-string arguments)))))
(defsubst tramp-error-with-buffer
(buf vec-or-proc signal fmt-string &rest arguments)
@@ -3599,8 +3599,8 @@ connection buffer."
"Tramp failed to connect. If this happens repeatedly, try\n"
" `\\[tramp-cleanup-this-connection]'")))
((eq exit 'timeout)
- (format-message
- "Timeout reached, see buffer ā%sā for details"
+ (format
+ "Timeout reached, see buffer `%s' for details"
(tramp-get-connection-buffer vec)))
(t "Login failed")))))
(when (numberp pos)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 1c6bdf1: Revert fbb5531fa11d13854b274d28ccd329c9b6652cfc for tramp.el.,
Michael Albinus <=