[Emacs-diffs] Changes to emacs/lisp/ielm.el

[Richard M. Stallman]

Index: emacs/lisp/ielm.el
diff -c emacs/lisp/ielm.el:1.25 emacs/lisp/ielm.el:1.26
*** emacs/lisp/ielm.el:1.25     Mon Feb 25 11:07:01 2002
--- emacs/lisp/ielm.el  Sat Jun 15 10:17:24 2002
***************
*** 260,281 ****
    "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)
--- 260,265 ----
***************
*** 306,312 ****
                (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))
                   (setq ielm-error-type "Read error")))
          (if ielm-error-type nil
            ;; Make sure working buffer has not been killed
--- 290,296 ----
                (setq rout (read-from-string ielm-string))
                (setq ielm-form (car rout))
                (setq ielm-pos (cdr rout)))
!           (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,341 ****
                            ;; 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))
                               (setq ielm-error-type "Eval error"))
                        (quit (setq ielm-result "Quit during evaluation")
                              (setq ielm-error-type "Eval error"))))
--- 319,325 ----
                            ;; 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 (error-message-string err))
                               (setq ielm-error-type "Eval error"))
                        (quit (setq ielm-result "Quit during evaluation")
                              (setq ielm-error-type "Eval error"))))