Fix minor text quoting in calc, calendar, vc

* lisp/calc/calc-ext.el (calc-shift-Z-prefix-help):
* lisp/calc/calc-help.el (calc-j-prefix-help):
* lisp/calc/calc-misc.el (calc-help):
* lisp/calc/calc.el (calc-algebraic-mode, calc-mode):
Escape an apostrophe in a docstring.
* lisp/calc/calc-forms.el (calc-hms-notation):
* lisp/calc/calc-mode.el (calc-display-raw, calc-algebraic-mode):
Escape an apostrophe in a diagnostic.
* lisp/calc/calc-misc.el (calc-help):
* lisp/calendar/diary-lib.el (diary-include-files):
* lisp/calendar/todo-mode.el (todo-prefix, todo-item-mark):
* lisp/vc/diff-mode.el (diff-delete-trailing-whitespace):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/ediff-merg.el (ediff-re-merge):
* lisp/vc/ediff-ptch.el (ediff-patch-file-internal):
* lisp/vc/ediff-util.el (ediff-test-save-region)
(ediff-status-info):
* lisp/vc/ediff.el (ediff-merge-revisions)
(ediff-merge-revisions-with-ancestor):
* lisp/vc/pcvs.el (cvs-mode-checkout, cvs-vc-command-advice):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
Respect text quoting style in doc string or diagnostic.
* lisp/calc/calc-prog.el (calc-kbd-push, calc-kbd-pop):
* lisp/vc/add-log.el (change-log-goto-source):
Avoid double-formatting.
* lisp/vc/ediff-init.el (format-message):
New backward-compatibility alias.

10 files changed, 35 insertions, 30 deletions

diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index e24b6ccae01..d120d052215 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -481,9 +481,9 @@ try to visit the file for the change under `point' instead."
                 (apply 'change-log-goto-source-1
                        (append change-log-find-head change-log-find-tail))
               (error
-               (format "Cannot find more matches for tag `%s' in file `%s'"
-                       (car change-log-find-head)
-                       (nth 2 change-log-find-head)))))
+               "Cannot find more matches for tag `%s' in file `%s'"
+               (car change-log-find-head)
+               (nth 2 change-log-find-head))))
     (save-excursion
       (let* ((at (point))
              (tag-at (change-log-search-tag-name))
@@ -515,9 +515,8 @@ try to visit the file for the change under `point' instead."
           (condition-case nil
               (setq change-log-find-tail
                     (apply 'change-log-goto-source-1 change-log-find-head))
-            (error
-             (format "Cannot find matches for tag `%s' in file `%s'"
-                     tag file)))))))))
+            (error "Cannot find matches for tag `%s' in file `%s'"
+                   tag file))))))))
 
 (defun change-log-next-error (&optional argp reset)
   "Move to the Nth (default 1) next match in a ChangeLog buffer.
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 948a45e6f5c..37ed4a53b44 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -2128,7 +2128,8 @@ fixed, visit it in a buffer."
         (goto-char hunk-end))
       (if modified-buffers
           (message "Deleted trailing whitespace from %s."
-                   (mapconcat (lambda (buf) (concat "`" (buffer-name buf) "'"))
+                   (mapconcat (lambda (buf) (format-message
+                                             "`%s'" (buffer-name buf)))
                               modified-buffers ", "))
         (message "No trailing whitespace to delete.")))))
 
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index b3093943d4e..352892c945a 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -1373,7 +1373,7 @@ affects only files whose names match the expression."
   ;; Normalize empty filter RE to nil.
   (unless (> (length filter-re) 0) (setq filter-re nil))
   ;; Indicate progress
-  (message "Comparing ‘%s’ and ‘%s’ modulo ‘%s’" d1 d2 filter-re)
+  (message "Comparing `%s' and `%s' modulo `%s'" d1 d2 filter-re)
   (cond
    ;; D1 & D2 directories => recurse
    ((and (file-directory-p d1)
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index d6b538cff2b..8c935bfab19 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -1719,6 +1719,9 @@ Unless optional argument INPLACE is non-nil, return a new string."
             (aset newstr i tochar)))
       newstr)))
 
+(unless (fboundp 'format-message)
+  (defalias 'format-message 'format))
+
 (defun ediff-abbrev-jobname (jobname)
   (cond ((eq jobname 'ediff-directories)
          "Compare two directories")
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index 72dfc0861f5..2da3de1a10e 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -268,8 +268,8 @@ Buffer B."
     (setq ediff-default-variant
           (intern
            (completing-read
-            (format "Current merge default is `%S'.  New default: "
-                    ediff-default-variant)
+            (format-message "Current merge default is `%S'.  New default: "
+                            ediff-default-variant)
             actual-alist nil 'must-match)))
     (ediff-do-merge ediff-current-difference 'remerge)
     (ediff-recenter)
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 80990feac35..b665034d135 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -723,7 +723,7 @@ optional argument, then use it."
           (with-output-to-temp-buffer ediff-msg-buffer
             (ediff-with-current-buffer standard-output
               (fundamental-mode))
-            (princ (format
+            (princ (format-message
                     "Patch program has failed due to a bad patch file,
 it couldn't apply all hunks, OR
 it couldn't create the backup for the file being patched.
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 26bba40b4b4..bf5bb5cd5da 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -2097,7 +2097,7 @@ ARG is a prefix argument.  If nil, copy the current difference region."
 
     (if this-buf-n-th-diff-saved
         (if (yes-or-no-p
-             (format
+             (format-message
               "You've previously copied diff region %d to buffer %S.  Confirm? "
               (1+ n) buf-type))
             t
@@ -2858,13 +2858,14 @@ Hit \\[ediff-recenter] to reset the windows afterward."
            (B-line (ediff-with-current-buffer ediff-buffer-B
                      (1+ (count-lines (point-min) (point)))))
            C-line)
-      (princ (format "\Buffer A's point is on line %d\n" A-line))
-      (princ (format "Buffer B's point is on line %d\n" B-line))
+      (princ (format-message "Buffer A's point is on line %d\n" A-line))
+      (princ (format-message "Buffer B's point is on line %d\n" B-line))
       (if ediff-3way-job
           (progn
             (setq C-line (ediff-with-current-buffer ediff-buffer-C
                            (1+ (count-lines (point-min) (point)))))
-            (princ (format "Buffer C's point is on line %d\n" C-line)))))
+            (princ (format-message
+                    "Buffer C's point is on line %d\n" C-line)))))
 
     (princ (format "\nCurrent difference number = %S\n"
                    (cond ((< ediff-current-difference 0) 'start)
@@ -2890,7 +2891,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
            (princ
             "\nIgnoring regions that match")
            (princ
-            (format
+            (format-message
              "\n\t regexp `%s' in buffer A  %S\n\t regexp `%s' in buffer B\n"
              ediff-regexp-hide-A ediff-hide-regexp-connective
              ediff-regexp-hide-B)))
@@ -2899,15 +2900,16 @@ Hit \\[ediff-recenter] to reset the windows afterward."
            (princ
             "\nFocusing on regions that match")
            (princ
-            (format
+            (format-message
              "\n\t regexp `%s' in buffer A  %S\n\t regexp `%s' in buffer B\n"
              ediff-regexp-focus-A ediff-focus-regexp-connective
              ediff-regexp-focus-B)))
           (t (princ "\nSelective browsing via a user-defined method.\n")))
 
     (princ
-     (format "\nBugs/suggestions: type `%s' while in Ediff Control Panel."
-             (substitute-command-keys "\\[ediff-submit-report]")))
+     (format-message
+      "\nBugs/suggestions: type `%s' while in Ediff Control Panel."
+      (substitute-command-keys "\\[ediff-submit-report]")))
     ) ; with output
   (if (frame-live-p ediff-control-frame)
       (ediff-reset-mouse ediff-control-frame))
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 837940c7763..65ca0bd4408 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -1294,7 +1294,7 @@ buffer."
   (let (rev1 rev2)
     (setq rev1
           (read-string
-           (format
+           (format-message
             "Version 1 to merge (default %s's working version): "
             (if (stringp file)
                 (file-name-nondirectory file) "current buffer")))
@@ -1326,7 +1326,7 @@ buffer."
   (let (rev1 rev2 ancestor-rev)
     (setq rev1
           (read-string
-           (format
+           (format-message
             "Version 1 to merge (default %s's working version): "
             (if (stringp file)
                 (file-name-nondirectory file) "current buffer")))
@@ -1338,7 +1338,7 @@ buffer."
                 (file-name-nondirectory file) "current buffer")))
           ancestor-rev
           (read-string
-           (format
+           (format-message
             "Ancestor version (default %s's base revision): "
             (if (stringp file)
                 (file-name-nondirectory file) "current buffer"))))
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 6d8e5374145..f6a9e08d84b 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -968,10 +968,10 @@ With a prefix argument, prompt for cvs FLAGS to use."
 The files are stored to DIR."
   (interactive
    (let* ((branch (cvs-prefix-get 'cvs-branch-prefix))
-          (prompt (format "CVS Checkout Directory for `%s%s': "
-                         (cvs-get-module)
-                         (if branch (format " (branch: %s)" branch)
-                           ""))))
+          (prompt (format-message "CVS Checkout Directory for `%s%s': "
+                                  (cvs-get-module)
+                                  (if branch (format " (branch: %s)" branch)
+                                    ""))))
      (list (read-directory-name prompt nil default-directory nil))))
   (let ((modules (split-string-and-unquote (cvs-get-module)))
         (flags (cvs-add-branch-prefix
@@ -2403,9 +2403,9 @@ The exact behavior is determined also by `cvs-dired-use-hook'."
                          (goto-char (point-min))
                          (looking-at ".*to add this file permanently\n\\'"))
                 (dolist (file (if (listp files) files (list files)))
-                  (insert "cvs add: scheduling file `"
-                          (file-name-nondirectory file)
-                          "' for addition\n")))
+                  (insert (format-message
+                           "cvs add: scheduling file `%s' for addition\n"
+                           (file-name-nondirectory file)))))
               ;; VC never (?) does `cvs -n update' so dcd=nil
               ;; should probably always be the right choice.
               (cvs-parse-process nil subdir))))))))
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 298bcefb7bf..0aa9c5a1e22 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -281,7 +281,7 @@ committed and support display of sticky tags."
     (propertize
      (if (zerop (length sticky-tag))
          string
-       (setq help-echo (format-message "%s on the ‘%s’ branch"
+       (setq help-echo (format-message "%s on the `%s' branch"
                                        help-echo sticky-tag))
        (concat string "[" sticky-tag "]"))
      'help-echo help-echo)))