4 files changed, 17 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 239a7b08af1..5ad97fe4571 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,15 @@
 2007-12-06  D. Goel  <deego3@gmail.com>
 
+        * progmodes/vhdl-mode.el (vhdl-template-modify): Ditto.
+
+        * progmodes/idlw-shell.el (idlwave-shell-send-command): Ditto.
+        (idlwave-shell-display-line): Ditto.
+
+        * progmodes/ada-xref.el (ada-find-file): Ditto.
+        (ada-get-all-references): Ditto.
+        (ada-xref-find-in-modified-ali): Ditto.
+        (ada-find-in-src-path): Ditto.
+
         * net/trampver.el (x): Ditto.
 
         * mail/uce.el (uce-reply-to-uce): Ditto.
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index ddea4c293df..a92705f92fa 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -564,7 +564,7 @@ Completion is available."
   (let ((file (ada-find-src-file-in-dir filename)))
     (if file
         (find-file file)
-      (error (concat filename " not found in src_dir")))))
+      (error "%s" (concat filename " not found in src_dir")))))
 
 
 ;; ----- Utilities -------------------------------------------------
@@ -1722,7 +1722,7 @@ Information is extracted from the ali file."
           ;; No more idea to find the declaration.  Give up
           (progn
             (kill-buffer ali-buffer)
-            (error (concat "No declaration of " (ada-name-of identlist)
+            (error "%s" (concat "No declaration of " (ada-name-of identlist)
                            " found."))
             )))
       )
@@ -1808,7 +1808,7 @@ This function is disabled for operators, and only works for identifiers."
            ;; none => error
            ((= len 0)
             (kill-buffer (current-buffer))
-            (error (concat "No declaration of "
+            (error "%s" (concat "No declaration of "
                            (ada-name-of identlist)
                            " recorded in .ali file")))
 
@@ -2011,7 +2011,7 @@ the declaration and documentation of the subprograms one is using."
                                   (string-to-number (nth 2 (car list)))
                                   identlist
                                   other-frame)
-        (error (concat (caar list) " not found in src_dir")))
+        (error "%s" (concat (caar list) " not found in src_dir")))
       (message "This is only a (good) guess at the cross-reference.")
       )
 
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index eebfd377a7e..153b95e65e4 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -1322,7 +1322,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)
@@ -2375,7 +2375,7 @@ matter what the settings of that variable."
     (if (not (idlwave-shell-valid-frame frame))
         ;; fixme: errors are dangerous in shell filters.  but i think i
         ;; have never encountered this one.
-        (error (concat "invalid frame - unable to access file: " (car frame)))
+        (error "%s" (concat "invalid frame - unable to access file: " (car frame)))
 ;;;
 ;;; buffer : the buffer to display a line in.
 ;;; select-shell: current buffer is the shell.
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index df315e4f46e..5b14e6a857f 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -9095,7 +9095,7 @@ otherwise."
          (progn (delete-region (point) (progn (end-of-line) (point)))
                 (vhdl-template-insert-date))
        (unless noerror
-         (error (concat "ERROR:  Modification date prefix string \""
+         (error "%s" (concat "ERROR:  Modification date prefix string \""
                         vhdl-modify-date-prefix-string "\" not found")))))))
 
 (defun vhdl-template-modify-noerror ()