From 66ae4cada5bb22737e63e59fdaf0983b12dc29bc Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 13 Aug 2016 23:30:55 -0500
Subject: [PATCH] Minor text-quoting-style fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* lisp/cus-edit.el (custom-buffer-create-internal):
* lisp/recentf.el (recentf-edit-list):
Follow text-quoting-style preference when quoting in UI strings.
* src/doc.c (Fsubstitute_command_keys): Don’t say that curved
quotes are substituted for, as this is no longer true.
---
 lisp/cus-edit.el | 4 +++-
 lisp/recentf.el  | 5 +++--
 src/doc.c        | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index ef1274534d6..2e39514cac6 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1617,7 +1617,9 @@ Otherwise use brackets."
     ;; Insert verbose help at the top of the custom buffer.
     (when custom-buffer-verbose-help
       (unless init-file
-	(widget-insert "Custom settings cannot be saved; maybe you started Emacs with `-q'.\n"))
+	(widget-insert
+         (format-message
+          "Custom settings cannot be saved; maybe you started Emacs with `-q'.\n")))
       (widget-insert "For help using this buffer, see ")
       (widget-create 'custom-manual
 		     :tag "Easy Customization"
diff --git a/lisp/recentf.el b/lisp/recentf.el
index dc9489752fb..e30e6468ebb 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1124,8 +1124,9 @@ IGNORE arguments."
   (recentf-dialog (format "*%s - Edit list*" recentf-menu-title)
     (set (make-local-variable 'recentf-edit-list) nil)
     (widget-insert
-     "Click on OK to delete selected files from the recent list.
-Click on Cancel or type `q' to cancel.\n")
+     (format-message
+      "Click on OK to delete selected files from the recent list.
+Click on Cancel or type `q' to cancel.\n"))
     ;; Insert the list of files as checkboxes
     (dolist (item recentf-list)
       (widget-create 'checkbox
diff --git a/src/doc.c b/src/doc.c
index e591ffca172..37a731bfcec 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -714,13 +714,13 @@ summary).
 Each substring of the form \\=\\<MAPVAR> specifies the use of MAPVAR
 as the keymap for future \\=\\[COMMAND] substrings.
 
-Each \\=‘ and \\=` is replaced by left quote, and each \\=’ and \\='
+Each grave accent \\=` is replaced by left quote, and each apostrophe \\='
 is replaced by right quote.  Left and right quote characters are
 specified by `text-quoting-style'.
 
-\\=\\= quotes the following character and is discarded; thus,
-\\=\\=\\=\\= puts \\=\\= into the output, \\=\\=\\=\\[ puts \\=\\[ into the output, and
-\\=\\=\\=` puts \\=` into the output.
+\\=\\= quotes the following character and is discarded; thus, \\=\\=\\=\\= puts \\=\\=
+into the output, \\=\\=\\=\\[ puts \\=\\[ into the output, and \\=\\=\\=` puts \\=` into the
+output.
 
 Return the original STRING if no substitutions are made.
 Otherwise, return a new string.  */)
-- 
2.39.5