Mercurial > emacs
changeset 87143:e1c8546ca1d5
Fix buggy `error' calls in progmodes/
| author | Deepak Goel <deego@gnufans.org> |
|---|---|
| date | Thu, 06 Dec 2007 18:36:46 +0000 |
| parents | a33cd731dd95 |
| children | 5db60f420c85 |
| files | lisp/ChangeLog lisp/progmodes/ada-xref.el lisp/progmodes/idlw-shell.el lisp/progmodes/vhdl-mode.el |
| diffstat | 4 files changed, 17 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Dec 06 18:22:45 2007 +0000 +++ b/lisp/ChangeLog Thu Dec 06 18:36:46 2007 +0000 @@ -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.
--- a/lisp/progmodes/ada-xref.el Thu Dec 06 18:22:45 2007 +0000 +++ b/lisp/progmodes/ada-xref.el Thu Dec 06 18:36:46 2007 +0000 @@ -564,7 +564,7 @@ (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 @@ ;; 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 @@ ;; 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 @@ (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.") )
--- a/lisp/progmodes/idlw-shell.el Thu Dec 06 18:22:45 2007 +0000 +++ b/lisp/progmodes/idlw-shell.el Thu Dec 06 18:36:46 2007 +0000 @@ -1322,7 +1322,7 @@ (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 @@ (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.
--- a/lisp/progmodes/vhdl-mode.el Thu Dec 06 18:22:45 2007 +0000 +++ b/lisp/progmodes/vhdl-mode.el Thu Dec 06 18:36:46 2007 +0000 @@ -9095,7 +9095,7 @@ (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 ()