diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ange-ftp.el | 2 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 2 | ||||
| -rw-r--r-- | lisp/net/newst-backend.el | 6 | ||||
| -rw-r--r-- | lisp/net/newst-treeview.el | 8 | ||||
| -rw-r--r-- | lisp/net/nsm.el | 2 | ||||
| -rw-r--r-- | lisp/net/rlogin.el | 4 | ||||
| -rw-r--r-- | lisp/net/soap-client.el | 3 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 10 |
8 files changed, 19 insertions, 18 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 0685bac26c7..62ee31657e1 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1107,7 +1107,7 @@ All HOST values should be in lower case.") (defun ange-ftp-message (fmt &rest args) "Display message in echo area, but indicate if truncated. Args are as in `message': a format string, plus arguments to be formatted." - (let ((msg (apply 'format fmt args)) + (let ((msg (apply #'format-message fmt args)) (max (window-width (minibuffer-window)))) (if noninteractive msg diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 235b2a2a111..418796a89c9 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -259,7 +259,7 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT." (message "%s: (err=[%s] %s) %s" "gnutls.el" doit (gnutls-error-string doit) - (apply 'format format (or params '(nil)))))) + (apply #'format-message format (or params '(nil)))))) (provide 'gnutls) diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index 435851cc504..01755488a64 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -846,10 +846,10 @@ Argument BUFFER is the buffer of the retrieval process." newsticker--cache name-symbol newsticker--error-headline - (format + (format-message (concat "%s: Newsticker could not retrieve news from %s.\n" - "Return status: `%s'\n" - "Command was `%s'") + "Return status: ‘%s’\n" + "Command was ‘%s’") (format-time-string "%A, %H:%M") feed-name event command) "" diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index eca2a9c3eca..ef8507e25ce 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -1268,8 +1268,8 @@ Note: does not update the layout." (expand-file-name (concat newsticker-dir "/groups")))) (file-exists-p newsticker-groups-filename) (y-or-n-p - (format - (concat "Obsolete variable `newsticker-groups-filename' " + (format-message + (concat "Obsolete variable ‘newsticker-groups-filename’ " "points to existing file \"%s\".\n" "Read it? ") newsticker-groups-filename)) @@ -1279,9 +1279,9 @@ Note: does not update the layout." (find-file-noselect filename)))) (and newsticker-groups-filename (file-exists-p newsticker-groups-filename) - (y-or-n-p (format + (y-or-n-p (format-message (concat "Delete the file \"%s\",\nto which the obsolete " - "variable `newsticker-groups-filename' points ? ") + "variable ‘newsticker-groups-filename’ points ? ") newsticker-groups-filename)) (delete-file newsticker-groups-filename)) (when buf diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index 261e5a1a36c..c54553ae5ea 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -304,7 +304,7 @@ unencrypted." (when (> (length cert) 0) (insert cert "\n")) (let ((start (point))) - (insert (apply 'format message args)) + (insert (apply #'format-message message args)) (goto-char start) ;; Fill the first line of the message, which usually ;; contains lots of explanatory text. diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el index e71179b6b89..c0dcc2332fe 100644 --- a/lisp/net/rlogin.el +++ b/lisp/net/rlogin.el @@ -174,8 +174,8 @@ If you wish to change directory tracking styles during a session, use the function `rlogin-directory-tracking-mode' rather than simply setting the variable." (interactive (list - (read-from-minibuffer (format - "Arguments for `%s' (hostname first): " + (read-from-minibuffer (format-message + "Arguments for ‘%s’ (hostname first): " (file-name-nondirectory rlogin-program)) nil nil nil 'rlogin-history) current-prefix-arg)) diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index 3fc60225c5a..a05108df0ae 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -51,7 +51,8 @@ (defsubst soap-warning (message &rest args) "Display a warning MESSAGE with ARGS, using the 'soap-client warning type." - (display-warning 'soap-client (apply 'format message args) :warning)) + (display-warning 'soap-client (apply #'format-message message args) + :warning)) (defgroup soap-client nil "Access SOAP web services from Emacs." diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 193d70b230a..69d7e1fe613 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 fmt-string arguments)))) + (insert (apply #'format-message 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 fmt-string arguments))))) - (signal signal (list (apply 'format fmt-string arguments))))) + (apply #'format-message fmt-string arguments))))) + (signal signal (list (apply #'format-message 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 - "Timeout reached, see buffer `%s' for details" + (format-message + "Timeout reached, see buffer ‘%s’ for details" (tramp-get-connection-buffer vec))) (t "Login failed"))))) (when (numberp pos) |