/[slime]/slime/swank.lisp
ViewVC logotype

Diff of /slime/swank.lisp

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

revision 1.507 by heller, Fri Aug 31 11:48:23 2007 UTC revision 1.508 by heller, Tue Sep 4 09:49:09 2007 UTC
# Line 1657  Errors are trapped and invoke our debugg Line 1657  Errors are trapped and invoke our debugg
1657    (call-with-debugger-hook    (call-with-debugger-hook
1658     #'swank-debugger-hook     #'swank-debugger-hook
1659     (lambda ()     (lambda ()
1660       (let (ok result reason)       (let (ok result)
1661         (unwind-protect         (unwind-protect
1662              (let ((*buffer-package* (guess-buffer-package buffer-package))              (let ((*buffer-package* (guess-buffer-package buffer-package))
1663                    (*buffer-readtable* (guess-buffer-readtable buffer-package))                    (*buffer-readtable* (guess-buffer-readtable buffer-package))
# Line 1666  Errors are trapped and invoke our debugg Line 1666  Errors are trapped and invoke our debugg
1666                (check-type *buffer-readtable* readtable)                (check-type *buffer-readtable* readtable)
1667                ;; APPLY would be cleaner than EVAL.                ;; APPLY would be cleaner than EVAL.
1668                ;;(setq result (apply (car form) (cdr form)))                ;;(setq result (apply (car form) (cdr form)))
1669                (handler-case                (setq result (eval form))
1670                    (progn                (run-hook *pre-reply-hook*)
1671                      (setq result (eval form))                (finish-output)
1672                      (run-hook *pre-reply-hook*)                (setq ok t))
                     (finish-output)  
                     (setq ok t))  
                 (request-abort (c)  
                   (setf ok nil)  
                   (setf reason (swank-backend::reason c)))))  
1673           (force-user-output)           (force-user-output)
1674           (send-to-emacs `(:return ,(current-thread)           (send-to-emacs `(:return ,(current-thread)
1675                                    ,(if ok                                    ,(if ok
1676                                         `(:ok ,result)                                         `(:ok ,result)
1677                                         `(:abort ,reason))                                         `(:abort))
1678                                    ,id)))))))                                    ,id)))))))
1679    
1680  (defvar *echo-area-prefix* "=> "  (defvar *echo-area-prefix* "=> "

Legend:
Removed from v.1.507  
changed lines
  Added in v.1.508

  ViewVC Help
Powered by ViewVC 1.1.5