# HG changeset patch
# User David Kastrup <dak@gnu.org>
# Date 1197075749 0
# Node ID e50a2e215441efbcb1815cef62726041158aff6c
# Parent  ac7eee19fc7ebdda3f2b8b76e28a617404d23491
* erc-stamp.el (erc-echo-timestamp):
* erc-lang.el (language):
* erc-backend.el (erc-server-connect): Fix buggy call to `message'.

* gnus-sum.el (gnus-summary-simplify-subject-query):
* ecomplete.el (ecomplete-display-matches): Fix buggy call to
`message'.

* textmodes/reftex.el (reftex-select-with-char):
* textmodes/reftex-toc.el (reftex-toc-do-promote)
(reftex-toc-visit-location, reftex-toc-find-section):
* textmodes/reftex-index.el (reftex-index-show-entry):
* textmodes/org.el (org-cycle-hide-archived-subtrees)
(org-table-rotate-recalc-marks, org-mark-ring-push)
(org-follow-info-link, org-mhe-get-message-folder-from-index)
(org-auto-repeat-maybe, org-store-log-note, org-delete-property)
(org-evaluate-time-range, org-edit-agenda-file-list):
* textmodes/artist.el (artist-select-next-op-in-list)
(artist-select-prev-op-in-list):
* term/mac-win.el (mac-service-insert-text):
* startup.el (fancy-about-screen):
* progmodes/vhdl-mode.el (vhdl-decision-query):
* progmodes/idlwave.el (idlwave-template)
(idlwave-scroll-completions, idlwave-display-completion-list):
* progmodes/ebrowse.el (ebrowse-show-progress):
* progmodes/cperl-mode.el (cperl-find-pods-heres):
* progmodes/antlr-mode.el (antlr-insert-option-do):
* play/mpuz.el (mpuz-close-game):
* net/rcirc.el (rcirc-next-active-buffer):
* mail/reporter.el (reporter-update-status):
* kmacro.el (kmacro-display):
* international/ja-dic-cnv.el (skkdic-set-okuri-nasi):
* emulation/viper-util.el (viper-save-setting):
* emacs-lisp/lisp-mnt.el (lm-verify):
* emacs-lisp/edebug.el (edebug-set-mode):
* emacs-lisp/checkdoc.el (checkdoc-rogue-spaces, checkdoc-defun):
* calendar/calendar.el (calendar-print-day-of-year):
* calc/calcalg3.el (calc-curve-fit):
* calc/calcalg2.el (math-integral):
* calc/calc.el (calc-read-key-sequence, calc-version):
* calc/calc-mode.el (calc-set-simplify-mode):
* calc/calc-ext.el (calc-fancy-prefix): Fix buggy call to
`message'.

diff -r ac7eee19fc7e -r e50a2e215441 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/ChangeLog	Sat Dec 08 01:02:29 2007 +0000
@@ -1,3 +1,41 @@
+2007-12-08  David Kastrup  <dak@gnu.org>
+
+	* textmodes/reftex.el (reftex-select-with-char):
+	* textmodes/reftex-toc.el (reftex-toc-do-promote)
+	(reftex-toc-visit-location, reftex-toc-find-section):
+	* textmodes/reftex-index.el (reftex-index-show-entry):
+	* textmodes/org.el (org-cycle-hide-archived-subtrees)
+	(org-table-rotate-recalc-marks, org-mark-ring-push)
+	(org-follow-info-link, org-mhe-get-message-folder-from-index)
+	(org-auto-repeat-maybe, org-store-log-note, org-delete-property)
+	(org-evaluate-time-range, org-edit-agenda-file-list):
+	* textmodes/artist.el (artist-select-next-op-in-list)
+	(artist-select-prev-op-in-list):
+	* term/mac-win.el (mac-service-insert-text):
+	* startup.el (fancy-about-screen):
+	* progmodes/vhdl-mode.el (vhdl-decision-query):
+	* progmodes/idlwave.el (idlwave-template)
+	(idlwave-scroll-completions, idlwave-display-completion-list):
+	* progmodes/ebrowse.el (ebrowse-show-progress):
+	* progmodes/cperl-mode.el (cperl-find-pods-heres):
+	* progmodes/antlr-mode.el (antlr-insert-option-do):
+	* play/mpuz.el (mpuz-close-game):
+	* net/rcirc.el (rcirc-next-active-buffer):
+	* mail/reporter.el (reporter-update-status):
+	* kmacro.el (kmacro-display):
+	* international/ja-dic-cnv.el (skkdic-set-okuri-nasi):
+	* emulation/viper-util.el (viper-save-setting):
+	* emacs-lisp/lisp-mnt.el (lm-verify):
+	* emacs-lisp/edebug.el (edebug-set-mode):
+	* emacs-lisp/checkdoc.el (checkdoc-rogue-spaces, checkdoc-defun):
+	* calendar/calendar.el (calendar-print-day-of-year):
+	* calc/calcalg3.el (calc-curve-fit):
+	* calc/calcalg2.el (math-integral):
+	* calc/calc.el (calc-read-key-sequence, calc-version):
+	* calc/calc-mode.el (calc-set-simplify-mode):
+	* calc/calc-ext.el (calc-fancy-prefix): Fix buggy call to
+	`message'.
+
 2007-12-07  D. Goel  <deego3@gmail.com>
 
 	* progmodes/idlw-shell.el (idlwave-shell-display-line)
diff -r ac7eee19fc7e -r e50a2e215441 lisp/calc/calc-ext.el
--- a/lisp/calc/calc-ext.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/calc/calc-ext.el	Sat Dec 08 01:02:29 2007 +0000
@@ -1434,7 +1434,7 @@
      (calc-set-command-flag 'no-align)
      (setq prefix (set flag (not (symbol-value flag)))
 	   prefix-arg n)
-     (message (if prefix msg "")))
+     (message "%s" (if prefix msg "")))
     (and prefix
 	 (not calc-is-keypad-press)
 	 (if (boundp 'overriding-terminal-local-map)
diff -r ac7eee19fc7e -r e50a2e215441 lisp/calc/calc-mode.el
--- a/lisp/calc/calc-mode.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/calc/calc-mode.el	Sat Dec 08 01:02:29 2007 +0000
@@ -505,7 +505,7 @@
 			     mode)
 		      (and (not (eq calc-simplify-mode mode))
 			   mode)))
-  (message (if (eq calc-simplify-mode mode)
+  (message "%s" (if (eq calc-simplify-mode mode)
 	       msg
 	     "Default simplifications enabled")))
 
diff -r ac7eee19fc7e -r e50a2e215441 lisp/calc/calc.el
--- a/lisp/calc/calc.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/calc/calc.el	Sat Dec 08 01:02:29 2007 +0000
@@ -1228,7 +1228,7 @@
   (let ((prompt2 (format "%s " (key-description (this-command-keys))))
 	(glob (current-global-map))
 	(loc (current-local-map)))
-    (or (input-pending-p) (message prompt))
+    (or (input-pending-p) (message "%s" prompt))
     (let ((key (calc-read-key t)))
       (calc-unread-command (cdr key))
       (unwind-protect
@@ -1244,7 +1244,7 @@
 (defun calc-version ()
   "Return version of this version of Calc."
   (interactive)
-  (message (concat "Calc version " calc-version)))
+  (message "Calc version %s" calc-version))
 
 (defun calc-mode ()
   "Calculator major mode.
diff -r ac7eee19fc7e -r e50a2e215441 lisp/calc/calcalg2.el
--- a/lisp/calc/calcalg2.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/calc/calcalg2.el	Sat Dec 08 01:02:29 2007 +0000
@@ -746,7 +746,7 @@
 		      (setq math-integ-msg (format
 					    "Working... Integrating %s"
 					    (math-format-flat-expr expr 0)))
-		      (message math-integ-msg)))
+		      (message "%s" math-integ-msg)))
 		(if math-cur-record
 		    (setcar (cdr math-cur-record)
 			    (if same-as-above (vector simp) 'busy))
@@ -773,7 +773,7 @@
 						     "simplification...\n")
 			      (setq val (math-integral simp 'no t))))))))
 	      (if (eq calc-display-working-message 'lots)
-		  (message math-integ-msg)))
+		  (message "%s" math-integ-msg)))
 	  (setcar (cdr math-cur-record) (or val
 				       (if (or math-enable-subst
 					       (not math-any-substs))
diff -r ac7eee19fc7e -r e50a2e215441 lisp/calc/calcalg3.el
--- a/lisp/calc/calcalg3.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/calc/calcalg3.el	Sat Dec 08 01:02:29 2007 +0000
@@ -416,7 +416,7 @@
              (calc-record (calc-normalize calc-fit-to-trail) "parm"))))
   (when plot
     (if (stringp plot)
-        (message plot)
+        (message "%s" plot)
       (let ((calc-graph-no-auto-view t))
         (calc-graph-delete t)
         (calc-graph-add-curve
diff -r ac7eee19fc7e -r e50a2e215441 lisp/calendar/calendar.el
--- a/lisp/calendar/calendar.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/calendar/calendar.el	Sat Dec 08 01:02:29 2007 +0000
@@ -3154,7 +3154,7 @@
 (defun calendar-print-day-of-year ()
   "Show day number in year/days remaining in year for date under the cursor."
   (interactive)
-  (message (calendar-day-of-year-string (calendar-cursor-to-date t))))
+  (message "%s" (calendar-day-of-year-string (calendar-cursor-to-date t))))
 
 (defun calendar-set-mode-line (str)
   "Set mode line to STR, centered, surrounded by dashes."
diff -r ac7eee19fc7e -r e50a2e215441 lisp/emacs-lisp/checkdoc.el
--- a/lisp/emacs-lisp/checkdoc.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/emacs-lisp/checkdoc.el	Sat Dec 08 01:02:29 2007 +0000
@@ -978,7 +978,7 @@
     (if (not (interactive-p))
 	e
       (if e
-	  (message (checkdoc-error-text e))
+	  (message "%s" (checkdoc-error-text e))
 	(checkdoc-show-diagnostics)
 	(message "Space Check: done.")))))
 
@@ -1038,15 +1038,15 @@
 	     (end (save-excursion (end-of-defun) (point)))
 	     (msg (checkdoc-this-string-valid)))
 	(if msg (if no-error
-		    (message (checkdoc-error-text msg))
+		    (message "%s" (checkdoc-error-text msg))
 		  (error "%s" (checkdoc-error-text msg)))
 	  (setq msg (checkdoc-message-text-search beg end))
 	  (if msg (if no-error
-		      (message (checkdoc-error-text msg))
+		      (message "%s" (checkdoc-error-text msg))
 		    (error "%s" (checkdoc-error-text msg)))
 	    (setq msg (checkdoc-rogue-space-check-engine beg end))
 	    (if msg (if no-error
-			(message (checkdoc-error-text msg))
+			(message "%s" (checkdoc-error-text msg))
 		      (error "%s" (checkdoc-error-text msg))))))
 	(if (interactive-p) (message "Checkdoc: done."))))))
 
diff -r ac7eee19fc7e -r e50a2e215441 lisp/emacs-lisp/edebug.el
--- a/lisp/emacs-lisp/edebug.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/emacs-lisp/edebug.el	Sat Dec 08 01:02:29 2007 +0000
@@ -3295,12 +3295,12 @@
   (if (eq (1+ edebug-recursion-depth) (recursion-depth))
       (progn
 	(setq edebug-execution-mode mode)
-	(message shortmsg)
+	(message "%s" shortmsg)
 	;; Continue execution
 	(exit-recursive-edit))
     ;; This is not terribly useful!!
     (setq edebug-next-execution-mode mode)
-    (message msg)))
+    (message "%s" msg)))
 
 
 (defalias 'edebug-step-through-mode 'edebug-step-mode)
diff -r ac7eee19fc7e -r e50a2e215441 lisp/emacs-lisp/lisp-mnt.el
--- a/lisp/emacs-lisp/lisp-mnt.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/emacs-lisp/lisp-mnt.el	Sat Dec 08 01:02:29 2007 +0000
@@ -562,7 +562,7 @@
 	       (t
 		ret)))))
     (if verbose
-	(message ret))
+	(message "%s" ret))
     ret))
 
 (defun lm-synopsis (&optional file showall)
diff -r ac7eee19fc7e -r e50a2e215441 lisp/emulation/viper-util.el
--- a/lisp/emulation/viper-util.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/emulation/viper-util.el	Sat Dec 08 01:02:29 2007 +0000
@@ -636,7 +636,7 @@
 	 (regexp (format "^[^;]*%s[ \t\n]*[a-zA-Z---_']*[ \t\n)]" var-name))
 	 (buf (find-file-noselect (substitute-in-file-name custom-file)))
 	)
-    (message message)
+    (message "%s" (or message ""))
     (save-excursion
       (set-buffer buf)
       (goto-char (point-min))
diff -r ac7eee19fc7e -r e50a2e215441 lisp/erc/ChangeLog
--- a/lisp/erc/ChangeLog	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/erc/ChangeLog	Sat Dec 08 01:02:29 2007 +0000
@@ -1,3 +1,9 @@
+2007-12-08  David Kastrup  <dak@gnu.org>
+
+	* erc-stamp.el (erc-echo-timestamp):
+	* erc-lang.el (language):
+	* erc-backend.el (erc-server-connect): Fix buggy call to `message'.
+
 2007-12-06  D. Goel  <deego3@gmail.com>
 
 	* erc-match.el (erc-add-entry-to-list): Fix buggy call to `error'.
diff -r ac7eee19fc7e -r e50a2e215441 lisp/erc/erc-backend.el
--- a/lisp/erc/erc-backend.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/erc/erc-backend.el	Sat Dec 08 01:02:29 2007 +0000
@@ -515,7 +515,7 @@
       (set-process-filter process 'erc-server-filter-function)
       (set-process-buffer process buffer)))
   (erc-log "\n\n\n********************************************\n")
-  (message (erc-format-message
+  (message "%s" (erc-format-message
             'login ?n
             (with-current-buffer buffer (erc-current-nick))))
   ;; wait with script loading until we receive a confirmation (first
diff -r ac7eee19fc7e -r e50a2e215441 lisp/erc/erc-lang.el
--- a/lisp/erc/erc-lang.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/erc/erc-lang.el	Sat Dec 08 01:02:29 2007 +0000
@@ -197,7 +197,7 @@
   "Return the language name for the ISO CODE."
   (interactive (list (completing-read "ISO language code: "
 				      iso-638-languages)))
-  (message (cdr (assoc code iso-638-languages))))
+  (message "%s" (cdr (assoc code iso-638-languages))))
 
 (defun erc-cmd-LANG (language)
   "Display the language name for the language code given by LANGUAGE."
diff -r ac7eee19fc7e -r e50a2e215441 lisp/erc/erc-stamp.el
--- a/lisp/erc/erc-stamp.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/erc/erc-stamp.el	Sat Dec 08 01:02:29 2007 +0000
@@ -412,8 +412,8 @@
   (when erc-echo-timestamps
     (let ((stamp (get-text-property now 'timestamp)))
       (when stamp
-	(message (format-time-string erc-echo-timestamp-format
-				     stamp))))))
+	(message "%s" (format-time-string erc-echo-timestamp-format
+					  stamp))))))
 
 (provide 'erc-stamp)
 
diff -r ac7eee19fc7e -r e50a2e215441 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/gnus/ChangeLog	Sat Dec 08 01:02:29 2007 +0000
@@ -1,3 +1,9 @@
+2007-12-08  David Kastrup  <dak@gnu.org>
+
+	* gnus-sum.el (gnus-summary-simplify-subject-query):
+	* ecomplete.el (ecomplete-display-matches): Fix buggy call to
+	`message'.
+
 2007-12-07  Glenn Morris  <rgm@gnu.org>
 
 	* gnus-art.el (article-make-date-line): Revert previous change.
diff -r ac7eee19fc7e -r e50a2e215441 lisp/gnus/ecomplete.el
--- a/lisp/gnus/ecomplete.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/gnus/ecomplete.el	Sat Dec 08 01:02:29 2007 +0000
@@ -119,7 +119,7 @@
 	  nil)
       (if (not choose)
 	  (progn
-	    (message matches)
+	    (message "%s" matches)
 	    nil)
 	(setq highlight (ecomplete-highlight-match-line matches line))
 	(while (not (memq (setq command (read-event highlight)) '(? return)))
diff -r ac7eee19fc7e -r e50a2e215441 lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/gnus/gnus-sum.el	Sat Dec 08 01:02:29 2007 +0000
@@ -4028,7 +4028,7 @@
   "Query where the respool algorithm would put this article."
   (interactive)
   (gnus-summary-select-article)
-  (message (gnus-general-simplify-subject (gnus-summary-article-subject))))
+  (message "%s" (gnus-general-simplify-subject (gnus-summary-article-subject))))
 
 (defun gnus-gather-threads-by-subject (threads)
   "Gather threads by looking at Subject headers."
diff -r ac7eee19fc7e -r e50a2e215441 lisp/international/ja-dic-cnv.el
--- a/lisp/international/ja-dic-cnv.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/international/ja-dic-cnv.el	Sat Dec 08 01:02:29 2007 +0000
@@ -558,7 +558,7 @@
 	 (while l
 	   (setq count (1+ count))
 	   (if (= (% count 10000) 0)
-	       (message (format "%d entries" count)))
+	       (message "%d entries" count))
 	   (setq entry (skkdic-extract-conversion-data (car l)))
 	   (set-nested-alist (car entry) (cdr entry) map)
 	   (setq l (cdr l)))
diff -r ac7eee19fc7e -r e50a2e215441 lisp/kmacro.el
--- a/lisp/kmacro.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/kmacro.el	Sat Dec 08 01:02:29 2007 +0000
@@ -404,7 +404,7 @@
 		   (format " [%s]"
 			   (format kmacro-counter-format-start kmacro-counter)))
 		 (if z (substring m 0 (1- x)) m) (if z "..." "")))
-    (message (or empty "No keyboard macros defined"))))
+    (message "%s" (or empty "No keyboard macros defined"))))
 
 
 (defun kmacro-repeat-on-last-key (keys)
diff -r ac7eee19fc7e -r e50a2e215441 lisp/mail/reporter.el
--- a/lisp/mail/reporter.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/mail/reporter.el	Sat Dec 08 01:02:29 2007 +0000
@@ -118,7 +118,7 @@
   "Periodically output a status message."
   (if (zerop (% reporter-status-count 10))
       (progn
-	(message reporter-status-message)
+	(message "%s" reporter-status-message)
 	(setq reporter-status-message (concat reporter-status-message "."))))
   (setq reporter-status-count (1+ reporter-status-count)))
 
diff -r ac7eee19fc7e -r e50a2e215441 lisp/net/rcirc.el
--- a/lisp/net/rcirc.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/net/rcirc.el	Sat Dec 08 01:02:29 2007 +0000
@@ -1708,13 +1708,13 @@
 	    (recenter -1)))
       (if (eq major-mode 'rcirc-mode)
 	  (switch-to-buffer (rcirc-non-irc-buffer))
-	(message (concat
-		  "No IRC activity."
-		  (when lopri
-		    (concat
-		     "  Type C-u "
-		     (key-description (this-command-keys))
-		     " for low priority activity."))))))))
+	(message "%s" (concat
+		       "No IRC activity."
+		       (when lopri
+			 (concat
+			  "  Type C-u "
+			  (key-description (this-command-keys))
+			  " for low priority activity."))))))))
 
 (defvar rcirc-activity-hooks nil
   "Hook to be run when there is channel activity.
diff -r ac7eee19fc7e -r e50a2e215441 lisp/play/mpuz.el
--- a/lisp/play/mpuz.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/play/mpuz.el	Sat Dec 08 01:02:29 2007 +0000
@@ -489,7 +489,7 @@
 			       ((< mpuz-nb-errors 10)	"bad!")
 			       ((< mpuz-nb-errors 15)	"awful.")
 			       (t			"not serious.")))))
-    (message message)
+    (message "%s" message)
     (sit-for 4)
     (if (y-or-n-p (concat message "  Start a new game? "))
 	(mpuz-start-new-game)
diff -r ac7eee19fc7e -r e50a2e215441 lisp/progmodes/antlr-mode.el
--- a/lisp/progmodes/antlr-mode.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/progmodes/antlr-mode.el	Sat Dec 08 01:02:29 2007 +0000
@@ -1875,7 +1875,7 @@
 					(read initial)
 				      initial))
 			       (cdr value))))
-	(message (cadr value))
+	(message "%s" (or (cadr value) ""))
 	(setq value nil)))
     ;; insert value ----------------------------------------------------------
     (if (consp old)
diff -r ac7eee19fc7e -r e50a2e215441 lisp/progmodes/cperl-mode.el
--- a/lisp/progmodes/cperl-mode.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/progmodes/cperl-mode.el	Sat Dec 08 01:02:29 2007 +0000
@@ -4581,7 +4581,7 @@
 					   (setq qtag "Can't find })")))
 				  (progn
 				    (goto-char (1- e))
-				    (message qtag))
+				    (message "%s" qtag))
 				(cperl-postpone-fontification
 				 (1- tag) (1- (point))
 				 'face font-lock-variable-name-face)
diff -r ac7eee19fc7e -r e50a2e215441 lisp/progmodes/ebrowse.el
--- a/lisp/progmodes/ebrowse.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/progmodes/ebrowse.el	Sat Dec 08 01:02:29 2007 +0000
@@ -896,10 +896,10 @@
   (let (message-log-max)
     (when start (setq ebrowse-n-boxes 0))
     (setq ebrowse-n-boxes (mod (1+ ebrowse-n-boxes) ebrowse-max-boxes))
-    (message (concat title ": "
-		     (propertize (make-string ebrowse-n-boxes
-					      (if (display-color-p) ?\  ?+))
-				 'face 'ebrowse-progress)))))
+    (message "%s: %s" title
+	     (propertize (make-string ebrowse-n-boxes
+				      (if (display-color-p) ?\  ?+))
+			 'face 'ebrowse-progress))))
 
 
 ;;; Reading a tree from disk
diff -r ac7eee19fc7e -r e50a2e215441 lisp/progmodes/idlwave.el
--- a/lisp/progmodes/idlwave.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/progmodes/idlwave.el	Sat Dec 08 01:02:29 2007 +0000
@@ -3799,7 +3799,7 @@
       (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'."
@@ -7038,7 +7038,7 @@
 			 (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)
@@ -7069,7 +7069,7 @@
   (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."
diff -r ac7eee19fc7e -r e50a2e215441 lisp/progmodes/vhdl-mode.el
--- a/lisp/progmodes/vhdl-mode.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/progmodes/vhdl-mode.el	Sat Dec 08 01:02:29 2007 +0000
@@ -10433,7 +10433,7 @@
   "Query a decision from the user."
   (let ((start (point)))
     (when string (vhdl-insert-keyword (concat string " ")))
-    (message prompt)
+    (message "%s" (or prompt ""))
     (let ((char (read-char)))
       (delete-region start (point))
       (if (and optional (eq char ?\r))
diff -r ac7eee19fc7e -r e50a2e215441 lisp/startup.el
--- a/lisp/startup.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/startup.el	Sat Dec 08 01:02:29 2007 +0000
@@ -1537,7 +1537,7 @@
 	  (apply #'fancy-splash-insert text)
 	  (insert "\n"))
 	(unless (current-message)
-	  (message fancy-splash-help-echo))
+	  (message "%s" (or fancy-splash-help-echo "")))
 	(set-buffer-modified-p nil)
 	(goto-char (point-min))
 	(force-mode-line-update))
diff -r ac7eee19fc7e -r e50a2e215441 lisp/term/mac-win.el
--- a/lisp/term/mac-win.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/term/mac-win.el	Sat Dec 08 01:02:29 2007 +0000
@@ -2178,7 +2178,7 @@
     (if (not buffer-read-only)
 	(insert text)
       (kill-new text)
-      (message
+      (message "%s"
        (substitute-command-keys
 	"The text from the Services menu can be accessed with \\[yank]")))))
 
diff -r ac7eee19fc7e -r e50a2e215441 lisp/textmodes/artist.el
--- a/lisp/textmodes/artist.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/textmodes/artist.el	Sat Dec 08 01:02:29 2007 +0000
@@ -1151,14 +1151,14 @@
   (interactive)
   (let ((next-op (cdr (cdr (assoc artist-curr-go artist-prev-next-op-alist)))))
     (artist-select-operation next-op)
-    (message next-op)))
+    (message "%s" next-op)))
 
 (defun artist-select-prev-op-in-list ()
   "Cyclically select previous drawing mode operation."
   (interactive)
   (let ((prev-op (car (cdr (assoc artist-curr-go artist-prev-next-op-alist)))))
     (artist-select-operation prev-op)
-    (message prev-op)))
+    (message "%s" prev-op)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
diff -r ac7eee19fc7e -r e50a2e215441 lisp/textmodes/org.el
--- a/lisp/textmodes/org.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/textmodes/org.el	Sat Dec 08 01:02:29 2007 +0000
@@ -7487,7 +7487,7 @@
 	(org-hide-archived-subtrees beg end)
 	(goto-char beg)
 	(if (looking-at (concat ".*:" org-archive-tag ":"))
-	    (message (substitute-command-keys
+	    (message "%s" (substitute-command-keys
 		      "Subtree is archived and stays closed.  Use \\[org-force-cycle-archived] to cycle it anyway.")))))))
 
 (defun org-force-cycle-archived ()
@@ -9366,7 +9366,8 @@
 	  (goto-line l1)))
     (if (not (= epos (point-at-eol))) (org-table-align))
     (goto-line l)
-    (and (interactive-p) (message (cdr (assoc new org-recalc-marks))))))
+    (and (interactive-p)
+	 (message "%s" (or (cdr (assoc new org-recalc-marks)) "")))))
 
 (defun org-table-maybe-recalculate-line ()
   "Recompute the current line if marked for it, and if we haven't just done it."
@@ -12347,7 +12348,7 @@
   (move-marker (car org-mark-ring)
 	       (or pos (point))
 	       (or buffer (current-buffer)))
-  (message
+  (message "%s"
    (substitute-command-keys
     "Position saved to mark ring, go back with \\[org-mark-ring-goto].")))
 
@@ -12429,7 +12430,7 @@
         (if (match-string 2 name) ; If there isn't a node, choose "Top"
             (Info-find-node (match-string 1 name) (match-string 2 name))
           (Info-find-node (match-string 1 name) "Top")))
-    (message (concat "Could not open: " name))))
+    (message "Could not open: %s" name)))
 
 (defun org-follow-gnus-link (&optional group article)
   "Follow a Gnus link to GROUP and ARTICLE."
@@ -12553,7 +12554,7 @@
   (save-excursion
     (mh-index-previous-folder)
     (re-search-forward "^\\(+.*\\)$" nil t)
-    (message (match-string 1))))
+    (message "%s" (match-string 1))))
 
 (defun org-mhe-get-message-folder ()
   "Return the name of the current message folder.  Be careful if you
@@ -13759,7 +13760,7 @@
 	  (org-timestamp-change n (cdr (assoc what whata))))
 	(setq msg (concat msg type org-last-changed-timestamp " ")))
       (setq org-log-post-message msg)
-      (message msg))))
+      (message "%s" msg))))
 
 (defun org-show-todo-tree (arg)
   "Make a compact tree which shows all headlines marked with TODO.
@@ -13978,7 +13979,7 @@
   (with-current-buffer (marker-buffer org-log-note-return-to)
     (goto-char org-log-note-return-to))
   (move-marker org-log-note-return-to nil)
-  (and org-log-post-message (message org-log-post-message)))
+  (and org-log-post-message (message "%s" org-log-post-message)))
 
 ;; FIXME: what else would be useful?
 ;; - priority
@@ -15216,10 +15217,10 @@
    (let* ((prop (completing-read
 		 "Property: " (org-entry-properties nil 'standard))))
      (list prop)))
-  (message (concat "Property " property
-		   (if (org-entry-delete nil property)
-		       " deleted"
-		     " was not present in the entry"))))
+  (message "Property %s %s" property
+	   (if (org-entry-delete nil property)
+	       "deleted"
+	     "was not present in the entry")))
 
 (defun org-delete-property-globally (property)
   "Remove PROPERTY globally, from all entries."
@@ -16863,7 +16864,7 @@
 	d (floor (+ (/ diff ds) 0.5))
 	h 0 m 0))
      (if (not to-buffer)
-	 (message (org-make-tdiff-string y d h m))
+	 (message "%s" (org-make-tdiff-string y d h m))
        (when (org-at-table-p)
 	 (goto-char match-end)
 	 (setq align t)
@@ -18806,7 +18807,7 @@
 			(org-install-agenda-files-menu)
 			(message "New agenda file list installed"))
 		      nil 'local)
-	(message (substitute-command-keys
+	(message "%s" (substitute-command-keys
 		  "Edit list and finish with \\[save-buffer]")))
     (customize-variable 'org-agenda-files)))
 
diff -r ac7eee19fc7e -r e50a2e215441 lisp/textmodes/reftex-index.el
--- a/lisp/textmodes/reftex-index.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/textmodes/reftex-index.el	Sat Dec 08 01:02:29 2007 +0000
@@ -367,7 +367,7 @@
             (goto-char (or pos (point-min)))
             (or (looking-at re)
                 (reftex-nearest-match re (length literal))))
-           (t (message reftex-no-follow-message) nil))))
+           (t (message "%s" reftex-no-follow-message) nil))))
     (when match
       (goto-char (match-beginning 0))
       (recenter '(4))
diff -r ac7eee19fc7e -r e50a2e215441 lisp/textmodes/reftex-toc.el
--- a/lisp/textmodes/reftex-toc.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/textmodes/reftex-toc.el	Sat Dec 08 01:02:29 2007 +0000
@@ -626,7 +626,7 @@
             (message "%d section%s %smoted" 
                      nsec (if (= 1 nsec) "" "s") pro-or-de)
             nil))
-    (if msg (progn (ding) (message msg)))))
+    (if msg (progn (ding) (message "%s" msg)))))
 
 
 (defun reftex-toc-restore-region (point-line &optional mark-line)
@@ -833,7 +833,7 @@
                     (switch-to-buffer-other-window 
                      (reftex-get-file-buffer-force file nil))
                     (goto-char (if (eq where 'bof) (point-min) (point-max))))
-                (message reftex-no-follow-message) nil))))
+                (message "%s" reftex-no-follow-message) nil))))
 
      ((stringp (car toc))
       ;; a label
@@ -900,7 +900,7 @@
                        (reftex-make-regexp-allow-for-ctrl-m literal) len)
                       (reftex-nearest-match
                        (reftex-make-desperate-section-regexp literal) len)))))
-           (t (message reftex-no-follow-message) nil))))
+           (t (message "%s" reftex-no-follow-message) nil))))
     (when match
       (goto-char (match-beginning 0))
       (if (not (= (point) (point-max))) (recenter 1))
diff -r ac7eee19fc7e -r e50a2e215441 lisp/textmodes/reftex.el
--- a/lisp/textmodes/reftex.el	Sat Dec 08 00:57:23 2007 +0000
+++ b/lisp/textmodes/reftex.el	Sat Dec 08 01:02:29 2007 +0000
@@ -1978,7 +1978,7 @@
   (let ((char ?\?))
     (save-window-excursion
       (catch 'exit
-        (message (concat prompt "   (?=Help)"))
+        (message "%s   (?=Help)" prompt)
         (when (or (sit-for (or delay-time 0))
                   (= ?\? (setq char (read-char-exclusive))))
           (reftex-kill-buffer "*RefTeX Select*")
@@ -1994,17 +1994,17 @@
                  (pos-visible-in-window-p (point-max)))
             nil
           (setq prompt (concat prompt (if scroll "   (SPC/DEL=Scroll)" ""))))
-        (message prompt)
+        (message "%s" prompt)
         (and (equal char ?\?) (setq char (read-char-exclusive)))
         (while t
           (cond ((equal char ?\C-g) (keyboard-quit))
                 ((equal char ?\?))
                 ((and scroll (equal char ?\ ))
                  (condition-case nil (scroll-up) (error nil))
-                 (message prompt))
+                 (message "%s" prompt))
                 ((and scroll (equal char ?\C-? ))
                  (condition-case nil (scroll-down) (error nil))
-                 (message prompt))
+                 (message "%s" prompt))
                 (t (message "") 
                    (throw 'exit char)))
           (setq char (read-char-exclusive)))))))