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

Diff of /slime/swank.lisp

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

revision 1.568 by heller, Tue Aug 12 12:57:02 2008 UTC revision 1.569 by heller, Tue Aug 12 12:57:09 2008 UTC
# Line 1044  The processing is done in the extent of Line 1044  The processing is done in the extent of
1044      (((:emacs-pong :emacs-return :emacs-return-string) thread-id &rest args)      (((:emacs-pong :emacs-return :emacs-return-string) thread-id &rest args)
1045       (send-event (find-thread thread-id) (cons (car event) args)))       (send-event (find-thread thread-id) (cons (car event) args)))
1046      (((:end-of-stream))      (((:end-of-stream))
1047       (close-connection *emacs-connection* nil (safe-backtrace)))))       (close-connection *emacs-connection* nil (safe-backtrace)))
1048        ((:reader-error packet condition)
1049         (encode-message `(:reader-error ,packet
1050                                         ,(safe-condition-message condition))
1051                         (current-socket-io)))))
1052    
1053  (defvar *event-queue* '())  (defvar *event-queue* '())
1054    
# Line 1418  NIL if streams are not globally redirect Line 1422  NIL if streams are not globally redirect
1422          (cond ((and (not c) timeout) (values nil t))          (cond ((and (not c) timeout) (values nil t))
1423                (t                (t
1424                 (and c (unread-char c stream))                 (and c (unread-char c stream))
1425                 (values (read-form (read-packet stream)) nil)))))))                 (let ((packet (read-packet stream)))
1426                     (handler-case (values (read-form packet) nil)
1427                       (reader-error (c)
1428                         `(:reader-error ,packet ,c))))))))))
1429    
1430  (defun read-packet (stream)  (defun read-packet (stream)
1431    (peek-char nil stream) ; wait while queuing interrupts    (peek-char nil stream) ; wait while queuing interrupts

Legend:
Removed from v.1.568  
changed lines
  Added in v.1.569

  ViewVC Help
Powered by ViewVC 1.1.5