Use %s to format strings instead of splicing them

If FOO might contain quotes that are part of a file or variable
name, the quotes should not be translated when showing FOO’s name
in a diagnostic.  So, for example, (message (concat (FOO ": bar")))
is not quite right, as it would translate FOO’s quotes.
Change it to (message "%s: bar" FOO) instead.
* lisp/allout.el (allout-process-exposed):
* lisp/calc/calc-ext.el (calc-do-prefix-help):
* lisp/calc/calc-store.el (calc-store-into):
* lisp/calendar/todo-mode.el (todo-category-completions):
* lisp/cedet/semantic/complete.el (semantic-completion-message):
* lisp/org/ob-latex.el (convert-pdf):
* lisp/org/org-crypt.el (org-crypt-check-auto-save):
* lisp/org/ox-latex.el (org-latex-compile):
* lisp/org/ox-man.el (org-man-compile):
* lisp/org/ox-odt.el (org-odt--export-wrap):
* lisp/org/ox-texinfo.el (org-texinfo-compile):
* lisp/progmodes/ruby-mode.el (ruby-in-ppss-context-p):
* lisp/progmodes/verilog-mode.el (verilog-batch-execute-func)
(verilog-signals-combine-bus, verilog-read-defines)
(verilog-getopt-file, verilog-expand-dirnames)
(verilog-modi-lookup, verilog-modi-modport-lookup-one):
* lisp/term/ns-win.el (ns-spi-service-call):
Use %s to avoid translating quotes of file names etc. in diagnostics.

6 files changed, 13 insertions, 12 deletions

diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index d0a413f1172..811c9ef92c6 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -183,7 +183,7 @@ This function is called by `org-babel-execute-src-block'."
   "Generate a file from a pdf file using imagemagick."
   (let ((cmd (concat "convert " im-in-options " " pdffile " "
                      im-out-options " " out-file)))
-    (message (concat "Converting pdffile file " cmd  "..."))
+    (message "Converting pdffile file %s..." cmd)
     (shell-command cmd)))
 
 (defun org-babel-latex-tex-to-pdf (file)
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el
index f527673cbd4..2b3445e47cd 100644
--- a/lisp/org/org-crypt.el
+++ b/lisp/org/org-crypt.el
@@ -133,9 +133,10 @@ See `org-crypt-disable-auto-save'."
        (and
         (eq org-crypt-disable-auto-save 'ask)
         (y-or-n-p "org-decrypt: auto-save-mode may cause leakage.  Disable it for current buffer? ")))
-      (message (concat "org-decrypt: Disabling auto-save-mode for " (or (buffer-file-name) (current-buffer))))
-                                        ; The argument to auto-save-mode has to be "-1", since
-                                        ; giving a "nil" argument toggles instead of disabling.
+      (message "org-decrypt: Disabling auto-save-mode for %s"
+               (or (buffer-file-name) (current-buffer)))
+      ;; The argument to auto-save-mode has to be "-1", since
+      ;; giving a "nil" argument toggles instead of disabling.
       (auto-save-mode -1))
      ((eq org-crypt-disable-auto-save nil)
       (message "org-decrypt: Decrypting entry with auto-save-mode enabled.  This may cause leakage."))
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index 91a864eee6e..51f7b17a8bf 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -2876,8 +2876,8 @@ Return PDF file name or an error if it couldn't be produced."
         ;; Check for process failure.  Provide collected errors if
         ;; possible.
         (if (not (file-exists-p pdffile))
-            (error (concat (format "PDF file %s wasn't produced" pdffile)
-                           (when errors (concat ": " errors))))
+            (error "PDF file %s wasn't produced%s" pdffile
+                   (if errors (concat ": " errors) ""))
           ;; Else remove log files, when specified, and signal end of
           ;; process to user, along with any error encountered.
           (when (and (not snippet) org-latex-remove-logfiles)
diff --git a/lisp/org/ox-man.el b/lisp/org/ox-man.el
index d7adcd5486d..09ad1866c0e 100644
--- a/lisp/org/ox-man.el
+++ b/lisp/org/ox-man.el
@@ -1219,8 +1219,8 @@ Return PDF file name or an error if it couldn't be produced."
         ;; Check for process failure.  Provide collected errors if
         ;; possible.
         (if (not (file-exists-p pdffile))
-            (error (concat (format "PDF file %s wasn't produced" pdffile)
-                           (when errors (concat ": " errors))))
+            (error "PDF file %s wasn't produced%s" pdffile
+                   (if errors (concat ": " errors) ""))
           ;; Else remove log files, when specified, and signal end of
           ;; process to user, along with any error encountered.
           (when org-man-remove-logfiles
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index 1ee201ba23f..9abda33f59d 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -4089,8 +4089,8 @@ contextual information."
                                          nil standard-output nil (cdr cmd)))))
                     (or (zerop exitcode)
                         (error (concat "Unable to create OpenDocument file."
-                                       (format "  Zip failed with error (%s)"
-                                               err-string)))))
+                                       "  Zip failed with error (%s)")
+                               err-string)))
                   cmds)))
              ;; Move the zip file from temporary work directory to
              ;; user-mandated location.
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index 5130329d4b4..67daf6f979e 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -1534,8 +1534,8 @@ Return INFO file name or an error if it couldn't be produced."
         ;; Check for process failure.  Provide collected errors if
         ;; possible.
         (if (not (file-exists-p infofile))
-            (error (concat (format "INFO file %s wasn't produced" infofile)
-                           (when errors (concat ": " errors))))
+            (error "INFO file %s wasn't produced%s" infofile
+                   (if errors (concat ": " errors) ""))
           ;; Else remove log files, when specified, and signal end of
           ;; process to user, along with any error encountered.
           (when org-texinfo-remove-logfiles