aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-06-15 14:19:02 +0000
committerRichard M. Stallman2002-06-15 14:19:02 +0000
commit568bbe5ed1c38bb0e9dba75a9288f5f1b9edb232 (patch)
treed31c3f0ab3557b946b86909e889460d32008945b
parent2268661ae2a28209fd0518017875283234c0f839 (diff)
downloademacs-568bbe5ed1c38bb0e9dba75a9288f5f1b9edb232.tar.gz
emacs-568bbe5ed1c38bb0e9dba75a9288f5f1b9edb232.zip
(ielm-eval-input): Use error-message-string.
(ielm-format-error, ielm-format-errors): Functions deleted.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ielm.el20
2 files changed, 7 insertions, 18 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67dbd77bacb..025fdf30447 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12002-06-15 Richard M. Stallman <rms@gnu.org>
2
3 * ielm.el (ielm-eval-input): Use error-message-string.
4 (ielm-format-error, ielm-format-errors): Functions deleted.
5
12002-06-14 Kim F. Storm <storm@filanet.dk> 62002-06-14 Kim F. Storm <storm@filanet.dk>
2 7
3 * progmodes/compile.el (grep-tree): Doc fixes. 8 * progmodes/compile.el (grep-tree): Doc fixes.
diff --git a/lisp/ielm.el b/lisp/ielm.el
index dc2f144b6fc..9143609c9a1 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -260,22 +260,6 @@ simply inserts a newline."
260 "Return non-nil if STRING is all whitespace." 260 "Return non-nil if STRING is all whitespace."
261 (or (string= string "") (string-match "\\`[ \t\n]+\\'" string))) 261 (or (string= string "") (string-match "\\`[ \t\n]+\\'" string)))
262 262
263(defun ielm-format-errors (errlist)
264 (let ((result ""))
265 (while errlist
266 (setq result (concat result (prin1-to-string (car errlist)) ", "))
267 (setq errlist (cdr errlist)))
268 (substring result 0 -2)))
269
270
271(defun ielm-format-error (err)
272 ;; Return a string form of the error ERR.
273 (format "%s%s"
274 (or (get (car err) 'error-message) "Peculiar error")
275 (if (cdr err)
276 (format ": %s" (ielm-format-errors (cdr err)))
277 "")))
278
279;;; Evaluation 263;;; Evaluation
280 264
281(defun ielm-eval-input (ielm-string) 265(defun ielm-eval-input (ielm-string)
@@ -306,7 +290,7 @@ simply inserts a newline."
306 (setq rout (read-from-string ielm-string)) 290 (setq rout (read-from-string ielm-string))
307 (setq ielm-form (car rout)) 291 (setq ielm-form (car rout))
308 (setq ielm-pos (cdr rout))) 292 (setq ielm-pos (cdr rout)))
309 (error (setq ielm-result (ielm-format-error err)) 293 (error (setq ielm-result (error-message-string err))
310 (setq ielm-error-type "Read error"))) 294 (setq ielm-error-type "Read error")))
311 (if ielm-error-type nil 295 (if ielm-error-type nil
312 ;; Make sure working buffer has not been killed 296 ;; Make sure working buffer has not been killed
@@ -335,7 +319,7 @@ simply inserts a newline."
335 ;; in let. Don't want to use save-excursion 319 ;; in let. Don't want to use save-excursion
336 ;; because we want to allow changes in point. 320 ;; because we want to allow changes in point.
337 (set-buffer ielm-obuf)) 321 (set-buffer ielm-obuf))
338 (error (setq ielm-result (ielm-format-error err)) 322 (error (setq ielm-result (error-message-string err))
339 (setq ielm-error-type "Eval error")) 323 (setq ielm-error-type "Eval error"))
340 (quit (setq ielm-result "Quit during evaluation") 324 (quit (setq ielm-result "Quit during evaluation")
341 (setq ielm-error-type "Eval error")))) 325 (setq ielm-error-type "Eval error"))))