[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv21466

Modified Files:
	ChangeLog swank.lisp test.sh 
Log Message:
* swank.lisp (install-fd-handler): Bind *emacs-connection* with
with-connection, for case when the signal hander is called out of
the blue.
(swank-debugger-hook): Don't assume that the hook argument is
#'swank-debugger-hook itself.

* test.sh (usage): Use cat rather not echo for here-documents.

--- /project/slime/cvsroot/slime/ChangeLog	2008/08/17 23:01:12	1.1464
+++ /project/slime/cvsroot/slime/ChangeLog	2008/08/17 23:01:18	1.1465
@@ -1,3 +1,13 @@
+2008-08-18  Helmut Eller  <heller at common-lisp.net>
+
+	* swank.lisp (install-fd-handler): Bind *emacs-connection* with
+	with-connection, for case when the signal hander is called out of
+	the blue.
+	(swank-debugger-hook): Don't assume that the hook argument is
+	#'swank-debugger-hook itself.
+
+	* test.sh (usage): Use cat rather not echo for here-documents.
+
 2008-08-17  Helmut Eller  <heller at common-lisp.net>
 
 	* slime.el (slime-inspector-show-source): New command.
--- /project/slime/cvsroot/slime/swank.lisp	2008/08/17 23:01:06	1.570
+++ /project/slime/cvsroot/slime/swank.lisp	2008/08/17 23:01:19	1.571
@@ -1167,7 +1167,8 @@
          (lambda () 
            (invoke-or-queue-interrupt
             (lambda () 
-              (dispatch-event `(:emacs-interrupt ,(current-thread-id))))))))
+              (with-connection (connection)
+                (dispatch-event `(:emacs-interrupt ,(current-thread-id)))))))))
   (handle-or-process-requests connection))
 
 (defun deinstall-fd-handler (connection)
@@ -2045,9 +2046,10 @@
 
 (defun swank-debugger-hook (condition hook)
   "Debugger function for binding *DEBUGGER-HOOK*."
+  (declare (ignore hook))
   (restart-case 
       (call-with-debugger-hook 
-       hook (lambda () (invoke-slime-debugger condition)))
+       #'swank-debugger-hook (lambda () (invoke-slime-debugger condition)))
     (default-debugger (&optional v)
       :report "Use default debugger." (declare (ignore v))
       (invoke-default-debugger condition))))
--- /project/slime/cvsroot/slime/test.sh	2008/08/12 12:56:51	1.14
+++ /project/slime/cvsroot/slime/test.sh	2008/08/17 23:01:19	1.15
@@ -14,11 +14,11 @@
 # are disclaimed.
 
 function usage () {
-    echo <<EOF 
+    cat <<EOF
 Usage: $name [-b] [-s] [-r]  <emacs> <lisp>"
--b  disable batch mode
--s  use screen to hide emacs
--r  show results file
+  -b  disable batch mode
+  -s  use screen to hide emacs
+  -r  show results file
 EOF
     exit 1
 }
@@ -26,7 +26,7 @@
 name=$0
 batch_mode=-batch
 
-while getopts vrb opt; do
+while getopts srb opt; do
     case $opt in
 	s) use_screen=true;;
 	r) dump_results=true;;