diff options
| author | Richard M. Stallman <[email protected]> | 2002-06-15 14:19:02 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 2002-06-15 14:19:02 +0000 |
| commit | 568bbe5ed1c38bb0e9dba75a9288f5f1b9edb232 (patch) | |
| tree | d31c3f0ab3557b946b86909e889460d32008945b | |
| parent | 2268661ae2a28209fd0518017875283234c0f839 (diff) | |
(ielm-eval-input): Use error-message-string.
(ielm-format-error, ielm-format-errors): Functions deleted.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/ielm.el | 20 |
2 files changed, 7 insertions, 18 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 67dbd77bac..025fdf3044 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-06-15 Richard M. Stallman <[email protected]> + + * ielm.el (ielm-eval-input): Use error-message-string. + (ielm-format-error, ielm-format-errors): Functions deleted. + 2002-06-14 Kim F. Storm <[email protected]> * progmodes/compile.el (grep-tree): Doc fixes. diff --git a/lisp/ielm.el b/lisp/ielm.el index dc2f144b6f..9143609c9a 100644 --- a/lisp/ielm.el +++ b/lisp/ielm.el @@ -260,22 +260,6 @@ simply inserts a newline." "Return non-nil if STRING is all whitespace." (or (string= string "") (string-match "\\`[ \t\n]+\\'" string))) -(defun ielm-format-errors (errlist) - (let ((result "")) - (while errlist - (setq result (concat result (prin1-to-string (car errlist)) ", ")) - (setq errlist (cdr errlist))) - (substring result 0 -2))) - - -(defun ielm-format-error (err) - ;; Return a string form of the error ERR. - (format "%s%s" - (or (get (car err) 'error-message) "Peculiar error") - (if (cdr err) - (format ": %s" (ielm-format-errors (cdr err))) - ""))) - ;;; Evaluation (defun ielm-eval-input (ielm-string) @@ -306,7 +290,7 @@ simply inserts a newline." (setq rout (read-from-string ielm-string)) (setq ielm-form (car rout)) (setq ielm-pos (cdr rout))) - (error (setq ielm-result (ielm-format-error err)) + (error (setq ielm-result (error-message-string err)) (setq ielm-error-type "Read error"))) (if ielm-error-type nil ;; Make sure working buffer has not been killed @@ -335,7 +319,7 @@ simply inserts a newline." ;; in let. Don't want to use save-excursion ;; because we want to allow changes in point. (set-buffer ielm-obuf)) - (error (setq ielm-result (ielm-format-error err)) + (error (setq ielm-result (error-message-string err)) (setq ielm-error-type "Eval error")) (quit (setq ielm-result "Quit during evaluation") (setq ielm-error-type "Eval error")))) |