From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 24 Aug 2015 11:40:05 +0000 (+0200)
Subject: Revert fbb5531fa11d13854b274d28ccd329c9b6652cfc for tramp.el.
X-Git-Tag: emacs-25.0.90~1269
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c6bdf18c0f2116edef7f7195ca5ed7a55a05e73;p=emacs.git

Revert fbb5531fa11d13854b274d28ccd329c9b6652cfc for tramp.el.
---

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)."
 ;	    (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)