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

Diff of /slime/swank.lisp

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

revision 1.268 by heller, Thu Dec 2 17:11:50 2004 UTC revision 1.269 by heller, Sun Dec 5 21:06:52 2004 UTC
# Line 616  of the toplevel restart." Line 616  of the toplevel restart."
616    
617  (defun send-to-socket-io (event)  (defun send-to-socket-io (event)
618    (log-event "DISPATCHING: ~S~%" event)    (log-event "DISPATCHING: ~S~%" event)
619    (flet ((send (o) (without-interrupts    (flet ((send (o)
620                       (encode-message o (current-socket-io)))))             (without-interrupts
621                 (encode-message o (current-socket-io)))))
622      (destructure-case event      (destructure-case event
623        (((:debug-activate :debug :debug-return :read-string :read-aborted)        (((:debug-activate :debug :debug-return :read-string :read-aborted)
624          thread &rest args)          thread &rest args)
# Line 1202  Errors are trapped and invoke our debugg Line 1203  Errors are trapped and invoke our debugg
1203    "Evaluate STRING and return the result.    "Evaluate STRING and return the result.
1204  If PACKAGE-UPDATE-P is non-nil, and evaluation causes a package  If PACKAGE-UPDATE-P is non-nil, and evaluation causes a package
1205  change, then send Emacs an update."  change, then send Emacs an update."
1206    (let (- values)    (unwind-protect
1207      (unwind-protect         (with-input-from-string (stream string)
1208           (with-input-from-string (stream string)           (let (- values)
1209             (loop for form = (read stream nil stream)             (loop
1210                   until (eq form stream)              (let ((form (read stream nil stream)))
1211                   do (progn                (when (eq form stream)
1212                        (setq - form)                  (fresh-line)
1213                        (setq values (multiple-value-list (eval form)))                  (force-output)
1214                        (force-output))                  (return (values values -)))
1215                   finally (progn                (setq - form)
1216                             (fresh-line)                (setq values (multiple-value-list (eval form)))
1217                             (force-output)                (force-output)))))
1218                             (return (values values -)))))      (when (and package-update-p (not (eq *package* *buffer-package*)))
1219        (when (and package-update-p (not (eq *package* *buffer-package*)))        (send-to-emacs
1220          (send-to-emacs         (list :new-package (package-name *package*)
1221           (list :new-package (package-name *package*)               (package-string-for-prompt *package*))))))
                (package-string-for-prompt *package*)))))))  
1222    
1223  (defun package-string-for-prompt (package)  (defun package-string-for-prompt (package)
1224    "Return the shortest nickname (or canonical name) of PACKAGE."    "Return the shortest nickname (or canonical name) of PACKAGE."

Legend:
Removed from v.1.268  
changed lines
  Added in v.1.269

  ViewVC Help
Powered by ViewVC 1.1.5