branch: externals/idlwave
commit d845f124b4a86cf4b94614acb75a3afd7eaccfb6
Author: JD Smith <jdtsm...@gmail.com>
Commit: JD Smith <jdtsm...@gmail.com>
Use argument %s to message/error
From upstream Emacs.
---
idlw-shell.el | 4 ++--
idlwave.el | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/idlw-shell.el b/idlw-shell.el
index e24dc9c05a..cfc129c02a 100644
--- a/idlw-shell.el
+++ b/idlw-shell.el
@@ -1317,7 +1317,7 @@ message, independent of what HIDE is set to."
(if (or (not (setq buf (get-buffer (idlwave-shell-buffer))))
(not (setq proc (get-buffer-process buf))))
(if (not idlwave-shell-automatic-start)
- (error
+ (error "%s"
(substitute-command-keys
"You need to first start an IDL shell with \\[idlwave-shell]"))
(idlwave-shell-recenter-shell-window)
@@ -2167,7 +2167,7 @@ Change the default directory for the process buffer to
concur."
(idlwave-shell-strip-input)
(if (string-match "\\([^\n\r]+\\)[\n\r]" idlwave-shell-command-output)
(let ((dir (match-string 1 idlwave-shell-command-output)))
- (message "Setting Emacs working dir to %s" dir)
+ ;;(message "Setting Emacs working dir to %s" dir)
(setq idlwave-shell-default-directory dir)
(setq default-directory (file-name-as-directory dir))))))
diff --git a/idlwave.el b/idlwave.el
index 8e3f20348c..93d557684f 100644
--- a/idlwave.el
+++ b/idlwave.el
@@ -3802,7 +3802,7 @@ unless the optional second argument NOINDENT is non-nil."
(if (not noindent)
(indent-region beg end nil))
(if (stringp prompt)
- (message prompt)))))
+ (message "%s" prompt)))))
(defun idlwave-rw-case (string)
"Make STRING have the case required by `idlwave-reserved-word-upcase'."
@@ -7047,7 +7047,7 @@ sort the list before displaying."
(select-window win)
(eval idlwave-complete-after-success-form))
(set-window-start cwin (point-min)))))
- (and message (message message)))
+ (and message (message "%s" message)))
(select-window win))))
(defun idlwave-display-completion-list (list &optional message beg complete)
@@ -7078,7 +7078,7 @@ sort the list before displaying."
(run-hooks 'idlwave-completion-setup-hook)
;; Display the message
- (message (or message "Making completion list...done")))
+ (message "%s" (or message "Making completion list...done")))
(defun idlwave-choose (function &rest args)
"Call FUNCTION as a completion chooser and pass ARGS to it."
