/[emacs]/emacs/lisp/ielm.el
ViewVC logotype

Diff of /emacs/lisp/ielm.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.25 by lektu, Mon Feb 25 16:07:01 2002 UTC revision 1.26 by rms, Sat Jun 15 14:17:24 2002 UTC
# Line 260  simply inserts a newline." Line 260  simply inserts a newline."
260    "Return non-nil if STRING is all whitespace."    "Return non-nil if STRING is all whitespace."
261    (or (string= string "") (string-match "\\`[ \t\n]+\\'" string)))    (or (string= string "") (string-match "\\`[ \t\n]+\\'" string)))
262    
 (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)))  
             "")))  
   
263  ;;; Evaluation  ;;; Evaluation
264    
265  (defun ielm-eval-input (ielm-string)  (defun ielm-eval-input (ielm-string)
# Line 306  simply inserts a newline." Line 290  simply inserts a newline."
290                  (setq rout (read-from-string ielm-string))                  (setq rout (read-from-string ielm-string))
291                  (setq ielm-form (car rout))                  (setq ielm-form (car rout))
292                  (setq ielm-pos (cdr rout)))                  (setq ielm-pos (cdr rout)))
293              (error (setq ielm-result (ielm-format-error err))              (error (setq ielm-result (error-message-string err))
294                     (setq ielm-error-type "Read error")))                     (setq ielm-error-type "Read error")))
295            (if ielm-error-type nil            (if ielm-error-type nil
296              ;; Make sure working buffer has not been killed              ;; Make sure working buffer has not been killed
# Line 335  simply inserts a newline." Line 319  simply inserts a newline."
319                              ;; in let.  Don't want to use save-excursion                              ;; in let.  Don't want to use save-excursion
320                              ;; because we want to allow changes in point.                              ;; because we want to allow changes in point.
321                              (set-buffer ielm-obuf))                              (set-buffer ielm-obuf))
322                          (error (setq ielm-result (ielm-format-error err))                          (error (setq ielm-result (error-message-string err))
323                                 (setq ielm-error-type "Eval error"))                                 (setq ielm-error-type "Eval error"))
324                          (quit (setq ielm-result "Quit during evaluation")                          (quit (setq ielm-result "Quit during evaluation")
325                                (setq ielm-error-type "Eval error"))))                                (setq ielm-error-type "Eval error"))))

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.26

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26