[Emacs-diffs] master 862561f 1/2: ‘text-quoting-style’ fixes for admin

[Paul Eggert]

branch: master
commit 862561f4a642416259ed265ba8c5071cffa4f303
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    ‘text-quoting-style’ fixes for admin
    
    * admin/admin.el (cusver-scan, cusver-check):
    * admin/authors.el (authors-canonical-file-name):
    * admin/bzrmerge.el (bzrmerge-missing):
    Respect ‘text-quoting-style’ in diagnostics.
---
 admin/admin.el    |    9 +++++----
 admin/authors.el  |    8 ++++----
 admin/bzrmerge.el |    4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/admin/admin.el b/admin/admin.el
index 914f187..6b213a7 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -674,8 +674,8 @@ If optional argument OLD is non-nil, also scan for 
`defvar's."
              (and (not old)
                   (equal "custom" (match-string 2))
                   (not (memq :type form))
-                  (display-warning 'custom
-                                   (format "Missing type in: `%s'" form)))
+                  (display-warning
+                    'custom (format-message "Missing type in: `%s'" form)))
              (setq ver (car (cdr-safe (memq :version form))))
              (if (equal "group" (match-string 2))
                  ;; Group :version could be old.
@@ -689,7 +689,7 @@ If optional argument OLD is non-nil, also scan for 
`defvar's."
                       (setq grp (car (cdr-safe grp))) ; (quote foo) -> foo
                       (setq ver (assq grp glist))))
                (setq alist (cons (cons var ver) alist))))
-          (if form (message "Malformed defcustom: `%s'" form)))))
+          (if form (format-message "Malformed defcustom: `%s'" form)))))
     (message "%sdone" m)
     alist))
 
@@ -781,7 +781,8 @@ changes (in a non-trivial way).  This function does not 
check for that."
        (message "No missing :version tags")
       (pop-to-buffer "*cusver*")
       (erase-buffer)
-      (insert "These `defcustom's might be missing :version tags:\n\n")
+      (insert (substitute-command-keys
+               "These `defcustom's might be missing :version tags:\n\n"))
       (dolist (elem result)
        (let* ((str (file-relative-name (car elem) newdir))
               (strlen (length str)))
diff --git a/admin/authors.el b/admin/authors.el
index 547e046..0afb3a8 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -1078,10 +1078,10 @@ to print a message if FILE is not found."
                  (string-match "^[0-9.]+$" file)
                  laxlog)
        (setq authors-invalid-file-names
-             (cons (format "%s:%d: unrecognized `%s' for %s"
-                           log-file
-                           (1+ (count-lines (point-min) pos))
-                           file author)
+             (cons (format-message "%s:%d: unrecognized `%s' for %s"
+                                   log-file
+                                   (1+ (count-lines (point-min) pos))
+                                   file author)
                    authors-invalid-file-names)))
       valid)))
 
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 7d4cd19..1bcbaa2 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -140,11 +140,11 @@ are both lists of revnos, in oldest-first order."
                     (setq str (substring str (match-end 0))))
                   (when (string-match "[.!;, ]+\\'" str)
                     (setq str (substring str 0 (match-beginning 0))))
-                  (let ((help-form "\
+                  (let ((help-form (substitute-command-keys "\
 Type `y' to skip this revision,
 `N' to include it and go on to the next revision,
 `n' to not skip, but continue to search this log entry for skip regexps,
-`q' to quit merging."))
+`q' to quit merging.")))
                     (pcase (save-excursion
                             (read-char-choice
                              (format "%s: Skip (y/n/N/q/%s)? " str