[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el (slime-popup-buffer-quit): Always delete windows and
bury the buffer.

--- /project/slime/cvsroot/slime/ChangeLog	2008/11/02 12:05:13	1.1580
+++ /project/slime/cvsroot/slime/ChangeLog	2008/11/02 12:05:24	1.1581
@@ -1,5 +1,10 @@
 2008-11-02  Helmut Eller  <heller at common-lisp.net>
 
+	* slime.el (slime-popup-buffer-quit): Always delete windows and
+	bury the buffer.
+
+2008-11-02  Helmut Eller  <heller at common-lisp.net>
+
 	* swank-backend.lisp (slime-interrupt-queued): New condition.
 	* swank.lisp (invoke-or-queue-interrupt): Raise it here.
 	* swank-cmucl.lisp (wait-for-input): Make fd readable in condition
--- /project/slime/cvsroot/slime/slime.el	2008/11/02 12:05:03	1.1059
+++ /project/slime/cvsroot/slime/slime.el	2008/11/02 12:05:24	1.1060
@@ -1050,11 +1050,13 @@
 last activated the buffer."
   (interactive)
   (let ((buffer (current-buffer)))
-    (when (slime-popup-buffer-snapshot-unchanged-p)
-      (slime-popup-buffer-restore-snapshot))
+    ;;(when (slime-popup-buffer-snapshot-unchanged-p)
+    ;;  (slime-popup-buffer-restore-snapshot))
     (setq slime-popup-buffer-saved-emacs-snapshot nil) ; buffer-local var!
-    (cond (kill-buffer-p (kill-buffer buffer))
-          (t (bury-buffer buffer)))))
+    (delete-windows-on buffer (selected-frame))
+    (bury-buffer buffer) 
+    (when kill-buffer-p
+      (kill-buffer buffer))))
 
 (defun slime-popup-buffer-snapshot-unchanged-p ()
   (equalp (slime-current-emacs-snapshot-fingerprint)
@@ -6393,12 +6395,11 @@
   (let ((string (or string
                     (car (slime-sexp-at-point-for-macroexpansion)))))
     (setq slime-eval-macroexpand-expression `(,expander ,string))
-    (slime-eval-async slime-eval-macroexpand-expression 
-                      (slime-rcurry #'slime-show-macroexpansion 
-                                    (slime-create-macroexpansion-buffer)))))
+    (slime-eval-async slime-eval-macroexpand-expression
+                      #'slime-show-macroexpansion)))
 
-(defun slime-show-macroexpansion (expansion buffer)
-  (pop-to-buffer buffer)
+(defun slime-show-macroexpansion (expansion &optional buffer)
+  (pop-to-buffer (or buffer (slime-create-macroexpansion-buffer)))
   (let ((inhibit-read-only t))
     (erase-buffer)
     (insert expansion)