[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el (slime-eval-with-transcript)
(slime-eval-with-transcript-cont): Restore the current buffer,
before calling cont.

--- /project/slime/cvsroot/slime/ChangeLog	2008/10/31 14:13:19	1.1576
+++ /project/slime/cvsroot/slime/ChangeLog	2008/10/31 14:13:34	1.1577
@@ -1,5 +1,11 @@
 2008-10-31  Helmut Eller  <heller at common-lisp.net>
 
+	* slime.el (slime-eval-with-transcript)
+	(slime-eval-with-transcript-cont): Restore the current buffer,
+	before calling cont.
+
+2008-10-31  Helmut Eller  <heller at common-lisp.net>
+
 	* swank-lispworks.lisp (describe-function): Don't use
 	string-upcase on lambda-list-argruments, because not all elements
 	must be symbols.
--- /project/slime/cvsroot/slime/slime.el	2008/10/31 14:13:10	1.1056
+++ /project/slime/cvsroot/slime/slime.el	2008/10/31 14:13:34	1.1057
@@ -5404,9 +5404,9 @@
   (when msg (slime-insert-transcript-delimiter msg))
   (setq slime-repl-popup-on-output (not no-popups))
   (setq cont (or cont #'slime-display-eval-result))
-  (slime-rex (cont) (form)
-    ((:ok value) (slime-eval-with-transcript-cont t value cont))
-    ((:abort) (slime-eval-with-transcript-cont nil nil nil))))
+  (slime-rex (cont (buffer (current-buffer))) (form)
+    ((:ok value) (slime-eval-with-transcript-cont t value cont buffer))
+    ((:abort) (slime-eval-with-transcript-cont nil nil nil buffer))))
 
 (defun slime-insert-transcript-delimiter (string)
   (with-current-buffer (slime-output-buffer)
@@ -5423,14 +5423,15 @@
       (slime-mark-output-start))
     (slime-repl-show-maximum-output)))
 
-(defun slime-eval-with-transcript-cont (ok result cont)
+(defun slime-eval-with-transcript-cont (ok result cont buffer)
   (run-with-timer 0.2 nil (lambda ()
                             (setq slime-repl-popup-on-output nil)))
   (with-current-buffer (slime-output-buffer)
     (save-excursion (slime-repl-insert-prompt))
-    (slime-repl-show-maximum-output)
+    (slime-repl-show-maximum-output))
+  (with-current-buffer buffer
     (cond (ok (funcall cont result))
-        (t (message "Evaluation aborted.")))))
+          (t (message "Evaluation aborted.")))))
 
 (defun slime-eval-describe (form)
   "Evaluate FORM in Lisp and display the result in a new buffer."