[slime-cvs] CVS slime

[CVS User trittweiler]

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

Modified Files:
	slime.el ChangeLog 
Log Message:
	When ever Slime seems to get stuck (e.g. after some character
	encoding confusion), `M-x slime-reset' should hopefully bring it
	into a functional state again.

	* slime.el (slime-reset): Erase connection buffer.


--- /project/slime/cvsroot/slime/slime.el	2009/10/21 14:37:08	1.1230
+++ /project/slime/cvsroot/slime/slime.el	2009/10/23 09:34:56	1.1231
@@ -2487,10 +2487,14 @@
   (slime-net-send sexp (slime-connection)))
 
 (defun slime-reset ()
-  "Clear all pending continuations."
+  "Clear all pending continuations and erase connection buffer."
   (interactive)
   (setf (slime-rex-continuations) '())
-  (mapc #'kill-buffer (sldb-buffers)))
+  (mapc #'kill-buffer (sldb-buffers))
+  ;; Due to character encoding errors, a half-processed RPC result may
+  ;; get stuck in the connection buffer and keep Slime choking.
+  (slime-with-connection-buffer ()
+    (erase-buffer)))
 
 (defun slime-send-sigint ()
   (interactive)
--- /project/slime/cvsroot/slime/ChangeLog	2009/10/21 14:37:08	1.1880
+++ /project/slime/cvsroot/slime/ChangeLog	2009/10/23 09:34:56	1.1881
@@ -1,3 +1,11 @@
+2009-10-23  Tobias C. Rittweiler <tcr at freebits.de>
+
+	When ever Slime seems to get stuck (e.g. after some character
+	encoding confusion), `M-x slime-reset' should hopefully bring it
+	into a functional state again.
+
+	* slime.el (slime-reset): Erase connection buffer.
+
 2009-10-21  Tobias C. Rittweiler <tcr at freebits.de>
 
 	Make M-x slime-changelog-date work.