diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/mail/feedmail.el | 2 | ||||
| -rw-r--r-- | lisp/mail/uce.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/ada-xref.el | 14 | ||||
| -rw-r--r-- | lisp/progmodes/idlw-shell.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/vhdl-mode.el | 5 |
6 files changed, 22 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1424867caff..5d2c39d3552 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2007-12-07 D. Goel <deego3@gmail.com> + + * progmodes/idlw-shell.el (idlwave-shell-display-line) + * progmodes/ada-xref.el (ada-find-file, ada-get-all-references) + (ada-xref-find-in-modified-ali, ada-find-in-src-path) + * mail/uce.el (uce-reply-to-uce) + * progmodes/vhdl-mode.el (vhdl-template-modify) + * mail/feedmail.el (feedmail-dump-message-to-queue): Improve calls + to `error' (as suggested by RMS.) + 2007-12-07 Glenn Morris <rgm@gnu.org> * allout.el (allout-write-file-hook-handler): diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 7fb40baa7c8..ab8611424db 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -1922,7 +1922,7 @@ mapped to mostly alphanumerics for safety." ;; progn to get nil result no matter what (progn (make-directory queue-directory t) nil) (file-accessible-directory-p queue-directory) - (error "%s" (concat "FQM: Message not queued; trouble with directory " queue-directory))) + (error "FQM: Message not queued; trouble with directory %s" queue-directory)) (let ((filename) (is-fqm) (is-in-this-dir) diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el index 54933993068..094cb03f861 100644 --- a/lisp/mail/uce.el +++ b/lisp/mail/uce.el @@ -239,7 +239,7 @@ address, and postmaster of the mail relay used." (full-header-p (and (eq uce-mail-reader 'rmail) (not (rmail-msg-is-pruned))))) (or (get-buffer message-buffer) - (error "%s" (concat "No buffer " message-buffer ", cannot find UCE"))) + (error "No buffer %s, cannot find UCE" message-buffer)) (switch-to-buffer message-buffer) ;; We need the message with headers pruned. (if full-header-p diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index a92705f92fa..00be89553a7 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 "%s" (concat filename " not found in src_dir"))))) + (error "%s not found in src_dir" filename)))) ;; ----- Utilities ------------------------------------------------- @@ -1722,8 +1722,8 @@ Information is extracted from the ali file." ;; No more idea to find the declaration. Give up (progn (kill-buffer ali-buffer) - (error "%s" (concat "No declaration of " (ada-name-of identlist) - " found.")) + + (error "No declaration of %s found." (ada-name-of identlist)) ))) ) @@ -1808,10 +1808,8 @@ This function is disabled for operators, and only works for identifiers." ;; none => error ((= len 0) (kill-buffer (current-buffer)) - (error "%s" (concat "No declaration of " - (ada-name-of identlist) - " recorded in .ali file"))) - + (error "No declaration of %s recorded in .ali file" + (ada-name-of identlist))) ;; one => should be the right one ((= len 1) (goto-line (caar declist))) @@ -2011,7 +2009,7 @@ the declaration and documentation of the subprograms one is using." (string-to-number (nth 2 (car list))) identlist other-frame) - (error "%s" (concat (caar list) " not found in src_dir"))) + (error "%s not found in src_dir" (caar list))) (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 153b95e65e4..1f184ea157d 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -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 "%s" (concat "invalid frame - unable to access file: " (car frame))) + (error "invalid frame - unable to access file: %s" (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 5b14e6a857f..dc9934a593d 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -9095,8 +9095,9 @@ otherwise." (progn (delete-region (point) (progn (end-of-line) (point))) (vhdl-template-insert-date)) (unless noerror - (error "%s" (concat "ERROR: Modification date prefix string \"" - vhdl-modify-date-prefix-string "\" not found"))))))) + (error "ERROR: Modification date prefix string \"%s\" not found" + vhdl-modify-date-prefix-string)))))) + (defun vhdl-template-modify-noerror () "Call `vhdl-template-modify' with NOERROR non-nil." |