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.

8 files changed, 34 insertions, 29 deletions

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index f4ba2264dc8..f54893fb4be 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -215,7 +215,7 @@ usually do not have translators for other languages.\n\n")))
 
     (insert "Please describe exactly what actions triggered the bug, and\n"
             "the precise symptoms of the bug.  If you can, give a recipe\n"
-            "starting from `emacs -Q':\n\n")
+            "starting from 'emacs -Q':\n\n")
     (let ((txt (delete-and-extract-region
                 (save-excursion (rfc822-goto-eoh) (line-beginning-position 2))
                 (point))))
@@ -225,7 +225,7 @@ usually do not have translators for other languages.\n\n")))
 
     (insert "If Emacs crashed, and you have the Emacs process in the gdb debugger,\n"
             "please include the output from the following gdb commands:\n"
-            "    `bt full' and `xbacktrace'.\n")
+            "    'bt full' and 'xbacktrace'.\n")
 
     (let ((debug-file (expand-file-name "DEBUG" data-directory)))
       (if (file-readable-p debug-file)
@@ -240,7 +240,7 @@ usually do not have translators for other languages.\n\n")))
     (if (fboundp 'x-server-vendor)
         (condition-case nil
             ;; This is used not only for X11 but also W32 and others.
-            (insert "Windowing system distributor `" (x-server-vendor)
+            (insert "Windowing system distributor '" (x-server-vendor)
                     "', version "
                     (mapconcat 'number-to-string (x-server-version) ".") "\n")
           (error t)))
@@ -253,7 +253,7 @@ usually do not have translators for other languages.\n\n")))
           (insert "System " lsb "\n")))
     (when (and system-configuration-options
                (not (equal system-configuration-options "")))
-      (insert "Configured using:\n `configure "
+      (insert "Configured using:\n 'configure "
               system-configuration-options "'\n\n")
       (fill-region (line-beginning-position -1) (point)))
     (insert "Configured features:\n" system-configuration-features "\n\n")
@@ -315,7 +315,7 @@ usually do not have translators for other languages.\n\n")))
 
     (insert (format "\nMemory information:\n"))
     (pp (garbage-collect) (current-buffer))
-    
+
     ;; This is so the user has to type something in order to send easily.
     (use-local-map (nconc (make-sparse-keymap) (current-local-map)))
     (define-key (current-local-map) "\C-c\C-i" 'info-emacs-bug)
@@ -417,7 +417,7 @@ and send the mail again%s."
                                          (regexp-quote (system-name)))
                                  from))
                (not (yes-or-no-p
-                     (format "Is `%s' really your email address? " from)))
+                     (format "Is '%s' really your email address? " from)))
                (error "Please edit the From address and try again"))))))
 
 
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index a94a81c5575..ccd892640ec 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1889,7 +1889,8 @@ with various lower-level mechanisms to provide features such as queueing."
 (defun feedmail-message-action-help-blat (d-string)
   (feedmail-say-debug ">in-> feedmail-message-action-help-blat")
   (with-output-to-temp-buffer feedmail-p-h-b-n
-    (princ "You're dispatching a message and feedmail queuing is enabled.
+    (princ (substitute-command-keys "\
+You're dispatching a message and feedmail queuing is enabled.
 Typing ? again will normally scroll this help buffer.
 
 Choices:
@@ -1914,7 +1915,7 @@ Synonyms:
    y  YUP          do the default behavior \(same as \"C-m\"\)
   SPC SCROLL UP    \(same as \">\"\)
 
-The user-configurable default is currently \"")
+The user-configurable default is currently \""))
         (princ d-string)
         (princ "\".  For other possibilities,
 see the variable feedmail-prompt-before-queue-user-alist.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 90a140b272c..67b04b56968 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -894,7 +894,7 @@ isn't provided."
       (error
        (display-warning
         'rmail
-        (format "Although MIME support is requested
+        (format-message "Although MIME support is requested
 through `rmail-enable-mime' being non-nil, the required feature
 `%s' (the value of `rmail-mime-feature')
 is not available in the current session.
@@ -2662,8 +2662,8 @@ Ask the user whether to add that list name to `mail-mailing-lists'."
                                       "\\>\\)"))
                           addr))
                         (y-or-n-p
-                         (format "Add `%s' to `mail-mailing-lists'? "
-                                 addr)))
+                         (format-message "Add `%s' to `mail-mailing-lists'? "
+                                         addr)))
                (customize-save-variable 'mail-mailing-lists
                                         (cons addr mail-mailing-lists)))))))))
 
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 6b753b39e17..1e770e6fea6 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -85,8 +85,11 @@ This uses `rmail-output-file-alist'."
                                       (error
                                        (display-warning
                                         :error
-                                        (format "Error evaluating \
-`rmail-output-file-alist' element:\nregexp: %s\naction: %s\nerror: %S\n"
+                                        (format-message "\
+Error evaluating `rmail-output-file-alist' element:
+regexp: %s
+action: %s
+error: %S\n"
                                                 (caar tail) (cdar tail) err))
                                        nil))))
                           (setq tail (cdr tail)))
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index f11511a9dc5..22e4cd737ec 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -1353,8 +1353,8 @@ show window is toggled off."
 This option is consulted when a prefix argument is used with
 \\[mh-sort-folder]. Normally default arguments to \"sortm\" are
 specified in the MH profile. This option may be used to provide
-an alternate view. For example, \"'(\"-nolimit\" \"-textfield\"
-\"subject\")\" is a useful setting."
+an alternate view. For example, ‘(\"-nolimit\" \"-textfield\"
+\"subject\")’ is a useful setting."
   :type '(repeat string)
   :group 'mh-folder
   :package-version '(MH-E . "8.0"))
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
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 64f56f0cc15..87f67183b55 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -336,11 +336,11 @@ RATING   a rating between 1 and 10 of the strength of the authentication.
                   (t rating)))
          (node (assoc type url-registered-auth-schemes)))
     (if (not (fboundp function))
-        (url-warn 'security
-                  (format (concat
-                           "Tried to register `%s' as an auth scheme"
-                           ", but it is not a function!") function)))
-
+        (url-warn
+         'security
+         (format-message
+          "Tried to register `%s' as an auth scheme, but it is not a function!"
+          function)))
     (if node
         (setcdr node (cons function rating))
       (setq url-registered-auth-schemes