[slime-cvs] CVS slime

[CVS User sboukarev]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el (slime-close-popup-window): Don't kill
slime-popup-restore-data local variable in another buffer.


--- /project/slime/cvsroot/slime/ChangeLog	2010/05/13 15:31:06	1.2092
+++ /project/slime/cvsroot/slime/ChangeLog	2010/05/16 04:15:18	1.2093
@@ -1,3 +1,8 @@
+2010-05-16  Stas Boukarev  <stassats at gmail.com>
+
+	* slime.el (slime-close-popup-window): Don't kill
+	slime-popup-restore-data local variable in another buffer.
+
 2010-05-13  Tobias C. Rittweiler <tcr at freebits.de>
 
 	* slime.el (define-slime-contrib): New macro.
--- /project/slime/cvsroot/slime/slime.el	2010/05/13 15:31:06	1.1317
+++ /project/slime/cvsroot/slime/slime.el	2010/05/16 04:15:18	1.1318
@@ -944,6 +944,7 @@
   (when slime-popup-restore-data
     (destructuring-bind (popup-window selected-window old-buffer)
         slime-popup-restore-data
+      (kill-local-variable 'slime-popup-restore-data)
       (bury-buffer)
       (when (eq popup-window (selected-window))
         (cond ((and (not old-buffer) (not (one-window-p)))
@@ -951,8 +952,7 @@
               ((and old-buffer (buffer-live-p old-buffer))
                (set-window-buffer popup-window old-buffer))))
       (when (window-live-p selected-window)
-        (select-window selected-window)))
-    (kill-local-variable 'slime-popup-restore-data)))
+        (select-window selected-window)))))
 
 (defmacro slime-save-local-variables (vars &rest body)
   (let ((vals (make-symbol "vals")))