Browse files

Use argument %s to message/error

From upstream Emacs.
  • Loading branch information...
1 parent 0f6c08f commit d845f124b4a86cf4b94614acb75a3afd7eaccfb6 @jdtsmith committed Jan 29, 2010
Showing with 5 additions and 5 deletions.
  1. +2 −2 idlw-shell.el
  2. +3 −3 idlwave.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"
"You need to first start an IDL shell with \\[idlwave-shell]"))
@@ -2167,7 +2167,7 @@ Change the default directory for the process buffer to concur."
(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))))))
@@ -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."

0 comments on commit d845f12

Please sign in to comment.