summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-08-31 12:42:45 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2015-08-31 12:56:10 -0700
commit8bbff0d64d0e6ba21366c9fb24f6973e6c59b8ac (patch)
treed2e2598e982d958e2243bc0d665cf7315055aebe /lisp/net
parent0ff60ec82f98032375e8569a98c08b72d879bce4 (diff)
downloademacs-8bbff0d64d0e6ba21366c9fb24f6973e6c59b8ac.tar.gz
emacs-8bbff0d64d0e6ba21366c9fb24f6973e6c59b8ac.tar.bz2
emacs-8bbff0d64d0e6ba21366c9fb24f6973e6c59b8ac.zip
Quoting fixes in lisp mail, mh-e, net, url
* lisp/mail/emacsbug.el (report-emacs-bug) (report-emacs-bug-hook): Use straight quotes in outgoing email, * lisp/mail/feedmail.el (feedmail-message-action-help-blat): * lisp/mail/rmail.el (rmail-unknown-mail-followup-to): * lisp/mail/rmailout.el (rmail-output-read-file-name): * lisp/net/imap.el (imap-interactive-login): * lisp/net/tls.el (open-tls-stream): * lisp/url/url-auth.el (url-register-auth-scheme): Respect ‘text-quoting-style’ in diagnostics. * lisp/mh-e/mh-e.el (mh-sortm-args): Quote docstring example using text quotes, not as a Lisp quote.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/imap.el17
-rw-r--r--lisp/net/tls.el2
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