summaryrefslogtreecommitdiff
path: root/lisp/calc
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-09-20 09:40:35 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2015-09-20 09:42:05 -0700
commitab11a1cf27ebe3791df45cccde3c851affd184dd (patch)
tree026e179d182fed09a07cb0a395fe7543feacb958 /lisp/calc
parent2ad2f8b084111e1479374fa38450de234242afaf (diff)
downloademacs-ab11a1cf27ebe3791df45cccde3c851affd184dd.tar.gz
emacs-ab11a1cf27ebe3791df45cccde3c851affd184dd.tar.bz2
emacs-ab11a1cf27ebe3791df45cccde3c851affd184dd.zip
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.
Diffstat (limited to 'lisp/calc')
-rw-r--r--lisp/calc/calc-ext.el5
-rw-r--r--lisp/calc/calc-store.el12
2 files changed, 8 insertions, 9 deletions
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 83722e761b0..933c446875e 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1327,9 +1327,8 @@ calc-kill calc-kill-region calc-yank))))
(setq calc-prefix-help-retry (= chr ??))
(if bnd
(call-interactively bnd)
- (if key
- (message (concat (key-description (vector key chr)) " is undefined"))
- (message (concat (key-description (vector chr)) " is undefined")))))))
+ (message "%s is undefined"
+ (key-description (if key (vector key chr) (vector chr))))))))
;;;; Commands.
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 3d8c865c7bf..21209c66677 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -58,8 +58,8 @@
(let ((msg
(calc-store-value var (or calc-given-value (calc-top 1))
"" calc-given-value-flag)))
- (message (concat "Stored to variable \"%s\"" msg)
- (calc-var-name var)))))
+ (message "Stored to variable \"%s\"%s"
+ (calc-var-name var) msg))))
(setq var (calc-is-assignments (calc-top 1)))
(if var
(while var
@@ -67,8 +67,8 @@
(calc-store-value (car (car var)) (cdr (car var))
(if (not (cdr var)) "")
(if (not (cdr var)) 1))))
- (message (concat "Stored to variable \"%s\"" msg)
- (calc-var-name (car (car var)))))
+ (message "Stored to variable \"%s\"%s"
+ (calc-var-name (car (car var))) msg))
(setq var (cdr var))))))))
(defun calc-store-plus (&optional var)
@@ -422,8 +422,8 @@
(calc-var-name var1)))))
(if var2
(let ((msg (calc-store-value var2 value "")))
- (message (concat "Variable \"%s\" copied to \"%s\"" msg)
- (calc-var-name var1) (calc-var-name var2))))))))
+ (message "Variable \"%s\" copied to \"%s\"%s"
+ (calc-var-name var1) (calc-var-name var2) msg)))))))
(defvar calc-last-edited-variable nil)
(defun calc-edit-variable (&optional var)