Message format fixes, commit no. 3

diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 3b6a6d611d2146de93f4af17b45f55a53b50319e..6a6d63a169a64f8ec352d67ead7402aaf2d1b57f 100644 (file)
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1539,7 +1539,7 @@ word itself has a special casing."
 
     (ada-save-exceptions-to-file file-name)
 
-    (message (concat "Defining " word " as a casing exception"))))
+    (message "%s" (concat "Defining " word " as a casing exception"))))
 
 (defun ada-case-read-exceptions-from-file (file-name)
   "Read the content of the casing exception file FILE-NAME."
@@ -2191,17 +2191,17 @@ This function is intended to be bound to the C-m and C-j keys."
 
       (if (equal (cdr cur-indent) '(0))
          (message (concat "same indentation as line " (number-to-string line)))
-       (message (mapconcat (lambda(x)
-                             (cond
-                              ((symbolp x)
-                               (symbol-name x))
-                              ((numberp x)
-                               (number-to-string x))
-                              ((listp x)
-                               (concat "- " (symbol-name (cadr x))))
-                              ))
-                           (cdr cur-indent)
-                           " + "))))
+       (message "%s" (mapconcat (lambda(x)
+                                  (cond
+                                   ((symbolp x)
+                                    (symbol-name x))
+                                   ((numberp x)
+                                    (number-to-string x))
+                                   ((listp x)
+                                    (concat "- " (symbol-name (cadr x))))
+                                   ))
+                                (cdr cur-indent)
+                                " + "))))
     (save-excursion
       (goto-char (car cur-indent))
       (sit-for 1))))
@@ -2214,7 +2214,7 @@ command like:
 
   (while command-line-args-left
     (let ((source (car command-line-args-left)))
-      (message (concat "formating " source))
+      (message "Formating %s" source)
       (find-file source)
       (ada-indent-region (point-min) (point-max))
       (ada-adjust-case-buffer)

diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 74b5694e8c34bc63c00b259dcb87403f99e73b13..241296d8f67d218a3813938d113c4a30f75be8be 100644 (file)
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -325,7 +325,7 @@ replaced by the name including the extension."
       ;; Check if there is an environment variable with the same name
       (if (null value)
          (if (not (setq value (getenv name)))
-             (message (concat "No environment variable " name " found"))))
+             (message "%s" (concat "No environment variable " name " found"))))
 
       (cond
        ((null value)

diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index e2bcf9845863fd6cd2a84c6fb7e3f66df419b008..b3051f37b9de718f4fd1a0ea845e20b79414d198 100644 (file)
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -346,13 +346,13 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
                    (format "\n#line %d \"%s\"\n" startlinenum filename)))
 
          ;; Call the preprocessor.
-         (if display (message mymsg))
+         (if display (message "%s" mymsg))
          (setq exit-status
                (call-process-region 1 (point-max)
                                     shell-file-name
                                     t (list t tempname) nil "-c"
                                     cppcommand))
-         (if display (message (concat mymsg "done")))
+         (if display (message "%s" (concat mymsg "done")))
          (if (= (buffer-size) 0)
              ;; Empty output is normal after a fatal error.
              (insert "\nPreprocessor produced no output\n")

diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 72603722dc28e01f1764fa103309ca4efb117e98..887e856ba1fccd93f9e4cd44180bec802ee2c951 100644 (file)
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -5,7 +5,7 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/11/19 22:30:34 vinicius>
+;; Time-stamp: <2005-09-18 07:27:20 deego>
 ;; Keywords: wp, ebnf, PostScript
 ;; Version: 4.2
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
@@ -4674,7 +4674,7 @@ killed after process termination."
       (goto-char the-point)
       (if ebnf-stop-on-error
          (error error-msg)
-       (message error-msg)))
+       (message "%s" error-msg)))
      ;; generated output OK
      (gen-func
       nil)

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index e5089d84fb0890ada43d42bdb9e0a7a47ba904a8..9ceee6f69202e71b87ff1dd30e420b43272e522a 100644 (file)
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -183,7 +183,7 @@ TEXT is a format control string, and the remaining arguments ARGS
 are the string substitutions (see `format')."
   (if (<= level flymake-log-level)
       (let* ((msg (apply 'format text args)))
-       (message msg)
+       (message "%s" msg)
        ;;(with-temp-buffer
        ;;    (insert msg)
        ;;   (insert "\n")

diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 1486825b07a078e84eb8b72749d2e076c0ddd82b..47d74f00aec798059596bc9eb15edd570136b70f 100644 (file)
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -1865,7 +1865,7 @@ extension EXTN.  Normally EXTN is given as the regular expression
 
           ;; Anything else means the input is invalid.
           (t
-           (message (format "Error parsing file %s." file))
+           (message "Error parsing file %s." file)
            (throw 'abort nil))))))
     l))
 

diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index cc706195cc23c3f5168af4de79771b6733303a77..7dc122267225a38d0e20e078f1db336429b78c11 100644 (file)
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -2263,7 +2263,7 @@ overlays."
     (idlwave-shell-display-line 
      (nth idlwave-shell-calling-stack-index stack) nil
      (unless idlwave-shell-electric-debug-mode 'no-debug)) 
-    (message (or message 
+    (message "%s" (or message 
                 (format "In routine %s (stack level %d)"
                         idlwave-shell-calling-stack-routine
                         (- idlwave-shell-calling-stack-index))))))

diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 0f1ea571a85552f3d0de63b722f0458e5d1c3b1a..ce689847e9c5246f316fbe9fec114265f58dd735 100644 (file)
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -3995,7 +3995,7 @@ you specify /."
              ;; Call etags
              (if (not (string-match "^[ \\t]*$" item))
                  (progn
-                   (message (concat "Tagging " item "..."))
+                   (message "%s" (concat "Tagging " item "..."))
                    (setq errbuf (get-buffer-create "*idltags-error*"))
                    (setq status (+ status
                                    (if (eq 0 (call-process
@@ -5188,7 +5188,7 @@ be set to nil to disable library catalog scanning."
                     message-base
                     (not (string= idlwave-library-catalog-libname
                                   old-libname)))
-               (message (concat message-base
+               (message "%s" (concat message-base
                                 idlwave-library-catalog-libname))
                (setq old-libname idlwave-library-catalog-libname))
              (when idlwave-library-catalog-routines

diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index fecf1f07eb549455eff7d8ec84dca05b58f37936..b49fcafe186aaa9e48c2747f4f69079698aa5ca9 100644 (file)
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -630,7 +630,7 @@ defines the beginning of a group. These tokens are:  {  [  <<"
              (current-column))
          (error
           (ding)
-          (message (error-message-string err))
+          (message "%s" (error-message-string err))
           0))
       (let (target)
        (if (not (re-search-backward "[^ \t\n\r\f][ \t\n\r\f]*\\=" nil t))

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e37390f5b80c10a31030a85d65e9a855d16999ab..fc3f0beee0417104ec3c31fba088c3b74f35319c 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2572,9 +2572,9 @@ If INFO is supplied it is used, else it is calculated from current line."
   (if (numberp blinkpos)
       (save-excursion
        (goto-char blinkpos)
-       (message msg)
+       (if msg (message "%s" msg) (message nil))
        (sit-for blink-matching-delay))
-    (message msg)))
+    (if message (message "%s" msg) (message nil))))
 
 (defun sh-show-indent (arg)
   "Show the how the currently line would be indented.
@@ -2591,7 +2591,7 @@ we are indenting relative to, if applicable."
         (curr-indent (current-indentation))
         val msg)
     (if (stringp var)
-       (message (setq msg var))
+       (message "%s" (setq msg var))
       (setq val (sh-calculate-indent info))
 
       (if (eq curr-indent val)
@@ -2610,8 +2610,8 @@ we are indenting relative to, if applicable."
          (if (and info (listp (car info))
                   (eq (car (car info)) t))
              (sh-blink (nth 1 (car info))  msg)
-           (message msg)))
-      (message msg))
+           (message "%s" msg)))
+      (message "%s" msg))
     ))
 
 (defun sh-set-indent ()
@@ -2624,7 +2624,7 @@ for a new value for it."
         (var (sh-get-indent-var-for-line info))
         val old-val indent-val)
     (if (stringp var)
-       (message (format "Cannot set indent - %s" var))
+       (message "Cannot set indent - %s" var)
       (setq old-val (symbol-value var))
       (setq val (sh-read-variable var))
       (condition-case nil
@@ -2675,7 +2675,7 @@ unless optional argument ARG (the prefix when interactive) is non-nil."
           (curr-indent (current-indentation)))
       (cond
        ((stringp var)
-       (message (format "Cannot learn line - %s" var)))
+       (message "Cannot learn line - %s" var))
        ((eq var 'sh-indent-comment)
        ;; This is arbitrary...
        ;; - if curr-indent is 0, set to curr-indent

diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 4014029b113b6650e597454d4c14208a23b81e0e..04ddf7b8fcd6ddc9f7ae1edb8ce8a05831327704 100644 (file)
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -2157,7 +2157,7 @@ Ignore byte-compiler warnings you might see."
 
 (defun vhdl-warning (string &optional nobeep)
   "Print out warning STRING and beep."
-  (message (concat "WARNING:  " string))
+  (message "WARNING:  %s" string)
   (unless (or nobeep noninteractive) (beep)))
 
 (defun vhdl-print-warnings ()
@@ -2165,7 +2165,7 @@ Ignore byte-compiler warnings you might see."
   (let ((no-warnings (length vhdl-warnings)))
     (setq vhdl-warnings (nreverse vhdl-warnings))
     (while vhdl-warnings
-      (message (concat "WARNING:  " (car vhdl-warnings)))
+      (message "WARNING:  %s" (car vhdl-warnings))
       (setq vhdl-warnings (cdr vhdl-warnings)))
     (beep)
     (when (> no-warnings 1)
@@ -10605,7 +10605,7 @@ but not if inside a comment or quote)."
            (vhdl-template-invoked-by-hook t))
        (let ((caught (catch 'abort
                        (funcall func))))
-         (when (stringp caught) (message caught)))
+         (when (stringp caught) (message "%s" caught)))
        (when (= invoke-char ?-) (setq abbrev-start-location (point)))
        ;; delete CR which is still in event queue
        (if (fboundp 'enqueue-eval-event)
@@ -10768,7 +10768,7 @@ but not if inside a comment or quote)."
 (defun vhdl-template-insert-fun (fun)
   "Call FUN to insert a built-in template."
   (let ((caught (catch 'abort (when fun (funcall fun)))))
-    (when (stringp caught) (message caught))))
+    (when (stringp caught) (message "%s" caught))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -11695,7 +11695,7 @@ reflected in a subsequent paste operation."
        (setq arch-buffer (current-buffer))
        (when ent-buffer (set-buffer ent-buffer) (save-buffer))
        (set-buffer arch-buffer) (save-buffer))
-      (message
+      (message "%s"
        (concat (format "Pasting port as testbench \"%s(%s)\"...done"
                       ent-name arch-name)
               (and ent-file-name
@@ -15498,7 +15498,7 @@ expansion function)."
     (setq arch-buffer (current-buffer))
     (when ent-buffer (set-buffer ent-buffer) (save-buffer))
     (set-buffer arch-buffer) (save-buffer)
-    (message
+    (message "%s"
      (concat (format "Creating component \"%s(%s)\"...done" ent-name arch-name)
             (and ent-file-name
                  (format "\n  File created: \"%s\"" ent-file-name))
@@ -16120,7 +16120,7 @@ current project/directory."
           (vhdl-template-footer)
         (vhdl-comment-display-line) (insert "\n"))
        (save-buffer))
-     (message
+     (message "%s"
       (concat (format "Generating configuration \"%s\"...done" conf-name)
              (and conf-file-name
                   (format "\n  File created: \"%s\"" conf-file-name))))))