Quoting fixes in Gnus

* lisp/gnus/gnus-agent.el:
(gnus-agent-possibly-synchronize-flags-server):
* lisp/gnus/gnus-art.el (gnus-article-browse-delete-temp-files):
* lisp/gnus/gnus-eform.el (gnus-edit-form):
* lisp/gnus/gnus-group.el (gnus-group-edit-group)
(gnus-group-nnimap-edit-acl):
* lisp/gnus/gnus-topic.el (gnus-topic-edit-parameters):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming):
* lisp/gnus/message.el (message-strip-subject-encoded-words)
(message-check-recipients, message-send-form-letter):
* lisp/gnus/mm-decode.el (mm-display-part):
* lisp/gnus/mm-uu.el (mm-uu-pgp-signed-extract-1):
* lisp/gnus/mml-smime.el (mml-smime-get-dns-cert)
(mml-smime-get-ldap-cert):
* lisp/gnus/spam-report.el (spam-report-process-queue):
Respect ‘text-quoting-style’ in diagnostics.
* lisp/gnus/gnus-art.el (article-display-face)
* lisp/gnus/gnus-fun.el (gnus-display-x-face-in-from):
Use straight quoting in email.
* lisp/gnus/rfc2231.el (rfc2231-decode-encoded-string):
Escape apostrophes in doc strings.

13 files changed, 27 insertions, 23 deletions

diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 7b35de076d2..fc75586ccd8 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -868,8 +868,9 @@ be a select method."
 		      (not (eq gnus-agent-synchronize-flags 'ask)))
 		 (and (eq gnus-agent-synchronize-flags 'ask)
 		      (gnus-y-or-n-p
-		       (format "Synchronize flags on server `%s'? "
-			       (cadr method))))))
+		       (gnus-format-message
+			"Synchronize flags on server `%s'? "
+			(cadr method))))))
     (gnus-agent-synchronize-flags-server method)))
 
 ;;;###autoload
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 1a439ec9940..b4a2f6a1773 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2428,7 +2428,7 @@ long lines if and only if arg is positive."
 	      (unless (setq from (gnus-article-goto-header "from"))
 		(insert "From:")
 		(setq from (point))
-		(insert " [no `from' set]\n"))
+		(insert " [no 'from' set]\n"))
 	      (while faces
 		(when (setq png (gnus-convert-face-to-png (pop faces)))
 		  (setq image
@@ -2770,7 +2770,7 @@ summary buffer."
       (cond ((file-directory-p file)
 	     (when (or (not (eq how 'file))
 		       (gnus-y-or-n-p
-			(format
+			(gnus-format-message
 			 "Delete temporary HTML file(s) in directory `%s'? "
 			 (file-name-as-directory file))))
 	       (gnus-delete-directory file)))
diff --git a/lisp/gnus/gnus-eform.el b/lisp/gnus/gnus-eform.el
index 0b41b5e8891..c870385840c 100644
--- a/lisp/gnus/gnus-eform.el
+++ b/lisp/gnus/gnus-eform.el
@@ -96,7 +96,8 @@ The optional LAYOUT overrides the `edit-form' window layout."
     (while (not (eobp))
       (insert ";;; ")
       (forward-line 1))
-    (insert ";; Type `C-c C-c' after you've finished editing.\n")
+    (insert (substitute-command-keys
+	     ";; Type `C-c C-c' after you've finished editing.\n"))
     (insert "\n")
     (let ((p (point)))
       (gnus-pp form)
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index ca14dd0b6db..2a535cb71dd 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -265,7 +265,7 @@ colors of the displayed X-Faces."
 	  (article-narrow-to-head)
 	  (gnus-article-goto-header "from")
 	  (when (bobp)
-	    (insert "From: [no `from' set]\n")
+	    (insert "From: [no 'from' set]\n")
 	    (forward-char -17))
 	  (gnus-add-image
 	   'xface
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index c6cc38fc461..ad49824f028 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2950,7 +2950,7 @@ and NEW-NAME will be prompted for."
 	    (gnus-info-params info))
 	   (t info))
      ;; The proper documentation.
-     (format
+     (gnus-format-message
       "Editing the %s for `%s'."
       (cond
        ((eq part 'method) "select method")
@@ -3278,7 +3278,8 @@ mail messages or news articles in files that have numeric names."
       (error "%s is not an nnimap group" group))
     (unless (setq acl (nnimap-acl-get mailbox (cadr method)))
       (error "Server does not support ACL's"))
-    (gnus-edit-form acl (format "Editing the access control list for `%s'.
+    (gnus-edit-form acl (gnus-format-message "\
+Editing the access control list for `%s'.
 
    An access control list is a list of (identifier . rights) elements.
 
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index 9474ca03069..7c6e1098100 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -1616,8 +1616,8 @@ If performed on a topic, edit the topic parameters instead."
       (let ((topic (gnus-group-topic-name)))
 	(gnus-edit-form
 	 (gnus-topic-parameters topic)
-	 (format "Editing the topic parameters for `%s'."
-		 (or group topic))
+	 (gnus-format-message "Editing the topic parameters for `%s'."
+			      (or group topic))
 	 `(lambda (form)
 	    (gnus-topic-set-parameters ,topic form)))))))
 
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index cb74228fdf9..ad135d4c2ed 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -612,7 +612,7 @@ If CONFIRM is non-nil, ask for confirmation before removing a file."
 	(when (and (> (- currday fileday) diff)
 		   (if confirm
 		       (y-or-n-p
-			(format "\
+			(gnus-format-message "\
 Delete old (> %s day(s)) incoming mail file `%s'? " diff bfile))
 		     (gnus-message 8 "\
 Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index d74ce43e5ed..0f6f63ea37d 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -2235,7 +2235,7 @@ contains a valid encoded word.  Decode again? "
 	  (unless cs-coding
 	    (setq cs-coding
 		  (mm-read-coding-system
-		   (format "\
+		   (gnus-format-message "\
 Decoded Subject \"%s\"
 contains an encoded word.  The charset `%s' is unknown or invalid.
 Hit RET to replace non-decodable characters with \"%s\" or enter replacement
@@ -4510,7 +4510,7 @@ This function could be useful in `message-setup-hook'."
 	  (dolist (bog (message-bogus-recipient-p addr))
 	    (and bog
 		 (not (y-or-n-p
-		       (format
+		       (gnus-format-message
 			"Address `%s'%s might be bogus.  Continue? "
 			bog
 			;; If the encoded version of the email address
@@ -8484,7 +8484,7 @@ Header and body are separated by `mail-header-separator'."
 	(when force
 	  (sit-for message-send-form-letter-delay))
 	(if (or force
-		  (y-or-n-p (format "Send message to `%s'? " to)))
+		  (y-or-n-p (gnus-format-message "Send message to `%s'? " to)))
 	    (progn
 	      (setq sent (1+ sent))
 	      (message-send-and-exit))
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index b0ec16ee03c..3d5a15afedb 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -855,7 +855,7 @@ external if displayed external."
 				      (concat
 				       "using external program \""
 				       (format method filename) "\"")
-				    (format
+				    (gnus-format-message
 				     "by calling `%s' on the contents)" method))
 				  "? "))))))
 	    (if external
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index fa48ee97bcd..8304f6f6a38 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -523,7 +523,8 @@ apply the face `mm-uu-extract'."
 	(when (and mml2015-use (null (mml2015-clear-verify-function)))
 	  (mm-set-handle-multipart-parameter
 	   mm-security-handle 'gnus-details
-	   (format "Clear verification not supported by `%s'.\n" mml2015-use)))
+	   (gnus-format-message
+	    "Clear verification not supported by `%s'.\n" mml2015-use)))
 	(mml2015-extract-cleartext-signature))
       (list (mm-make-handle buf mm-uu-text-plain-type)))))
 
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 3f0809edbe8..0bcc9c53c48 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -202,7 +202,7 @@ Whether the passphrase is cached at all is controlled by
 					"")))))
 	  (if (setq cert (smime-cert-by-dns who))
 	      (setq result (list 'certfile (buffer-name cert)))
-	    (setq bad (format "`%s' not found. " who))))
+	    (setq bad (gnus-format-message "`%s' not found. " who))))
       (quit))
     result))
 
@@ -221,7 +221,7 @@ Whether the passphrase is cached at all is controlled by
 					"")))))
 	  (if (setq cert (smime-cert-by-ldap who))
 	      (setq result (list 'certfile (buffer-name cert)))
-	    (setq bad (format "`%s' not found. " who))))
+	    (setq bad (gnus-format-message "`%s' not found. " who))))
       (quit))
     result))
 
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index ef7187cbd96..2bc23334199 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -209,10 +209,10 @@ must never cause a Lisp error."
 (defun rfc2231-decode-encoded-string (string)
   "Decode an RFC2231-encoded string.
 These look like:
- \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
- \"us-ascii''This%20is%20%2A%2A%2Afun%2A%2A%2A\",
- \"'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
- \"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
+ \"us-ascii\\='en-us\\='This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"us-ascii\\='\\='This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"\\='en-us\\='This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"\\='\\='This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
  \"This is ***fun***\"."
   (string-match "\\`\\(?:\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string)
   (let ((coding-system (mm-charset-to-coding-system
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 96d72de91c5..de680795a10 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -307,7 +307,7 @@ symbol `ask', query before flushing the queue file."
     (if (or (eq keep nil)
 	    (and (eq keep 'ask)
 		 (y-or-n-p
-		  (format
+		  (gnus-format-message
 		   "Flush requests from `%s'? " (current-buffer)))))
 	(progn
 	  (gnus-message 7 "Flushing request file `%s'"