diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/imap.el | 17 | ||||
| -rw-r--r-- | lisp/net/tls.el | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/lisp/net/imap.el b/lisp/net/imap.el index 3e5982398fd..cc53e0432b6 100644 --- a/lisp/net/imap.el +++ b/lisp/net/imap.el @@ -850,15 +850,16 @@ t if it successfully authenticates, nil otherwise." (while (or (not user) (not passwd)) (setq user (or imap-username (read-from-minibuffer - (concat "imap: username for " imap-server - " (using stream `" (symbol-name imap-stream) - "'): ") + (format-message + "imap: username for %s (using stream ‘%s’): " + imap-server imap-stream) (or user imap-default-user)))) - (setq passwd (or imap-password - (read-passwd - (concat "imap: password for " user "@" - imap-server " (using authenticator `" - (symbol-name imap-auth) "'): ")))) + (setq passwd + (or imap-password + (read-passwd + (format-message + "imap: password for %s@%s (using authenticator ‘%s’): " + user imap-server imap-auth)))) (when (and user passwd) (if (funcall loginfunc user passwd) (progn diff --git a/lisp/net/tls.el b/lisp/net/tls.el index 9e02945225e..1226916275c 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el @@ -275,7 +275,7 @@ Fourth arg PORT is an integer specifying a port to connect to." (message "The certificate presented by `%s' is \ NOT trusted." host)) (not (yes-or-no-p - (format "The certificate presented by `%s' is \ + (format-message "The certificate presented by `%s' is \ NOT trusted. Accept anyway? " host))))) (and tls-hostmismatch (save-excursion |