[slime-cvs] CVS slime

[CVS User trittweiler]

Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv5248

Modified Files:
	ChangeLog swank.lisp 
Log Message:
	* swank.lisp (*swank-state-stack*): Delete. Not needed anymore.
	(defslimefun state-stack): Delete.
	(decode-message): Adapted.
	(debug-in-emacs): Adapted.


--- /project/slime/cvsroot/slime/ChangeLog	2010/01/11 13:23:08	1.1962
+++ /project/slime/cvsroot/slime/ChangeLog	2010/01/13 13:45:49	1.1963
@@ -1,3 +1,10 @@
+2010-01-13  Tobias C. Rittweiler <tcr at freebits.de>
+
+	* swank.lisp (*swank-state-stack*): Delete. Not needed anymore.
+	(defslimefun state-stack): Delete.
+	(decode-message): Adapted.
+	(debug-in-emacs): Adapted.
+
 2010-01-11  Mark Evenson  <evenson at dada.local>
 
 	* swank-abcl.lisp (emacs-inspect): Implementation for Java
--- /project/slime/cvsroot/slime/swank.lisp	2010/01/03 15:46:44	1.682
+++ /project/slime/cvsroot/slime/swank.lisp	2010/01/13 13:45:49	1.683
@@ -312,10 +312,6 @@
 (defvar *emacs-connection* nil
   "The connection to Emacs currently in use.")
 
-(defvar *swank-state-stack* '()
-  "A list of symbols describing the current state.  Used for debugging
-and to detect situations where interrupts can be ignored.")
-
 (defun default-connection ()
   "Return the 'default' Emacs connection.
 This connection can be used to talk with Emacs when no specific
@@ -325,10 +321,6 @@
 recently established one."
   (first *connections*))
 
-(defslimefun state-stack ()
-  "Return the value of *SWANK-STATE-STACK*."
-  *swank-state-stack*)
-
 (defslimefun ping (tag)
   tag)
 
@@ -1738,12 +1730,11 @@
 (defun decode-message (stream)
   "Read an S-expression from STREAM using the SLIME protocol."
   ;;(log-event "decode-message~%")
-  (let ((*swank-state-stack* (cons :read-next-form *swank-state-stack*)))
-    (handler-bind ((error (lambda (c) (error (make-swank-protocol-error c)))))
-      (let ((packet (read-packet stream)))
-        (handler-case (values (read-form packet) nil)
-          (reader-error (c) 
-            `(:reader-error ,packet ,c)))))))
+  (handler-bind ((error (lambda (c) (error (make-swank-protocol-error c)))))
+    (let ((packet (read-packet stream)))
+      (handler-case (values (read-form packet) nil)
+        (reader-error (c) 
+          `(:reader-error ,packet ,c))))))
 
 ;; use peek-char to detect EOF, read-sequence may return 0 instead of
 ;; signaling a condition.
@@ -2554,8 +2545,7 @@
                             (symbol-value '*buffer-package*))
                        *package*))
         (*sldb-level* (1+ *sldb-level*))
-        (*sldb-stepping-p* nil)
-        (*swank-state-stack* (cons :swank-debugger-hook *swank-state-stack*)))
+        (*sldb-stepping-p* nil))
     (force-user-output)
     (call-with-debugging-environment
      (lambda ()