[slime-cvs] CVS update: slime/ChangeLog slime/slime.el slime/swank-sbcl.lisp

[Dan Barlow]

Update of /project/slime/cvsroot/slime
In directory common-lisp.net:/tmp/cvs-serv18779

Modified Files:
	ChangeLog slime.el swank-sbcl.lisp 
Log Message:
	* swank-sbcl.lisp (serve-request): more fiddling with serve-event
	descriptors

	* slime.el (slime-repl-return): slime-check-connected, otherwise
	pressing Return in an unconnected repl gets a bit weird 


Date: Wed Dec 10 14:02:35 2003
Author: dbarlow

Index: slime/ChangeLog
diff -u slime/ChangeLog:1.146 slime/ChangeLog:1.147
--- slime/ChangeLog:1.146	Wed Dec 10 08:27:54 2003
+++ slime/ChangeLog	Wed Dec 10 14:02:35 2003
@@ -1,3 +1,11 @@
+2003-12-10  Daniel Barlow  <dan at telent.net>
+
+	* swank-sbcl.lisp (serve-request): more fiddling with serve-event
+	descriptors
+
+	* slime.el (slime-repl-return): slime-check-connected, otherwise
+	pressing Return in an unconnected repl gets a bit weird 
+
 2003-12-10  Helmut Eller  <e9626484 at stud3.tuwien.ac.at>
 
 	* swank-allegro.lisp, swank-lispworks.lisp, swank-openmcl.lisp,


Index: slime/slime.el
diff -u slime/slime.el:1.135 slime/slime.el:1.136
--- slime/slime.el:1.135	Wed Dec 10 08:13:28 2003
+++ slime/slime.el	Wed Dec 10 14:02:35 2003
@@ -1707,6 +1707,7 @@
 With prefix argument send the input even if the parenthesis are not
 balanced."
   (interactive)
+  (slime-check-connected)
   (unless (or (slime-idle-p)
               (slime-reading-p))
     (error "Lisp is not ready for requests from the REPL."))


Index: slime/swank-sbcl.lisp
diff -u slime/swank-sbcl.lisp:1.39 slime/swank-sbcl.lisp:1.40
--- slime/swank-sbcl.lisp:1.39	Wed Dec 10 08:26:08 2003
+++ slime/swank-sbcl.lisp	Wed Dec 10 14:02:35 2003
@@ -103,7 +103,7 @@
 (defvar *use-dedicated-output-stream* t)
 
 (defun accept-connection (server-socket)
-  "Accept one Swank TCP connection on SOCKET and then close it."
+  "Accept one Swank TCP connection on SERVER-SOCKET and then close it."
   (let* ((socket (accept server-socket))
 	 (stream (sb-bsd-sockets:socket-make-stream 
 		  socket :input t :output t :element-type 'base-char))
@@ -132,7 +132,10 @@
       (slime-read-error (e)
         (when *swank-debug-p*
           (format *debug-io* "~&;; Connection to Emacs lost.~%;; [~A]~%" e))
-        (close *emacs-io* :abort t)))))
+        (sb-sys:invalidate-descriptor (sb-impl::fd-stream-fd *emacs-io*))
+        (close *emacs-io* :abort t)
+        (when *use-dedicated-output-stream* 
+          (close *slime-output* :abort t))))))
 
 ;;; Utilities