[slime-cvs] CVS slime

[heller]

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

Modified Files:
	slime.el 
Log Message:
(slime-repl-read-break): Use a :emacs-interrupt message
instead of a RPC to swank:simple-break.  Suggested by Taylor R
Campbell.

(slime-dispatch-event, slime-interrupt): Decide whether to use SIGINT
or a :emacs-interrupt message in slime-interrupt.


--- /project/slime/cvsroot/slime/slime.el	2006/11/23 23:10:40	1.691
+++ /project/slime/cvsroot/slime/slime.el	2006/11/24 23:33:52	1.692
@@ -2648,8 +2648,7 @@
        (assert thread)
        (sldb-exit thread level stepping))
       ((:emacs-interrupt thread)
-       (cond ((slime-use-sigint-for-interrupt) (slime-send-sigint))
-             (t (slime-send `(:emacs-interrupt ,thread)))))
+       (slime-send `(:emacs-interrupt ,thread)))
       ((:read-string thread tag)
        (assert thread)
        (slime-repl-read-string thread tag))
@@ -4245,7 +4244,7 @@
 
 (defun slime-repl-read-break ()
   (interactive)
-  (slime-eval-async `(swank:simple-break)))
+  (slime-dispatch-event `(:emacs-interrupt ,(car slime-read-string-threads))))
 
 (defun slime-repl-abort-read (thread tag)
   (with-current-buffer (slime-output-buffer)
@@ -7835,7 +7834,8 @@
 (defun slime-interrupt ()
   "Interrupt Lisp."
   (interactive)
-  (slime-dispatch-event `(:emacs-interrupt ,slime-current-thread)))
+  (cond ((slime-use-sigint-for-interrupt) (slime-send-sigint))
+        (t (slime-dispatch-event `(:emacs-interrupt ,slime-current-thread)))))
 
 (defun slime-quit ()
   (error "Not implemented properly.  Use `slime-interrupt' instead."))