[slime-cvs] CVS slime/contrib

[CVS User sboukarev]

Update of /project/slime/cvsroot/slime/contrib
In directory tiger.common-lisp.net:/tmp/cvs-serv32664

Modified Files:
	ChangeLog slime-fuzzy.el 
Log Message:
* slime-fuzzy.el (slime-fuzzy-done): Fix completion in the minibuffer.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2011/10/01 01:35:42	1.493
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2011/10/01 02:32:58	1.494
@@ -1,5 +1,9 @@
 2011-10-01  Stas Boukarev  <stassats at gmail.com>
 
+	* slime-fuzzy.el (slime-fuzzy-done): Fix completion in the minibuffer.
+
+2011-10-01  Stas Boukarev  <stassats at gmail.com>
+
 	* swank-asdf.lisp (xref-doit): Guard against using on things
 	other than symbols and strings. slime-edit-uses may call it on
 	(setf function), and it'll pop into the debugger.
--- /project/slime/cvsroot/slime/contrib/slime-fuzzy.el	2010/10/15 16:16:11	1.22
+++ /project/slime/cvsroot/slime/contrib/slime-fuzzy.el	2011/10/01 02:32:58	1.23
@@ -328,6 +328,11 @@
       (setq slime-fuzzy-text text)
       (goto-char slime-fuzzy-end)))))
 
+(defun slime-minibuffer-p (buffer)
+  (if (featurep 'xemacs)
+      (eq buffer (window-buffer (minibuffer-window)))
+      (minibufferp buffer)))
+
 (defun slime-fuzzy-choices-buffer (completions interrupted-p start end)
   "Creates (if neccessary), populates, and pops up the *Fuzzy
 Completions* buffer with the completions from `completions' and
@@ -361,10 +366,7 @@
       (setq buffer-quit-function 'slime-fuzzy-abort)) ; M-Esc Esc
     (when slime-fuzzy-completion-in-place
       ;; switch back to the original buffer
-      (if (if (featurep 'xemacs)
-              (eq (window-buffer (minibuffer-window))
-                  slime-fuzzy-target-buffer)
-              (minibufferp slime-fuzzy-target-buffer))
+      (if (slime-minibuffer-p slime-fuzzy-target-buffer)
           (select-window (minibuffer-window))
           (switch-to-buffer-other-window slime-fuzzy-target-buffer)))))
 
@@ -555,7 +557,9 @@
         ;; completions buffer and let something else fill it in.
         (pop-to-buffer (slime-get-fuzzy-buffer))
         (bury-buffer))
-    (pop-to-buffer slime-fuzzy-target-buffer)
+    (if (slime-minibuffer-p slime-fuzzy-target-buffer)
+        (select-window (minibuffer-window))
+        (pop-to-buffer slime-fuzzy-target-buffer))
     (goto-char slime-fuzzy-end)
     (setq slime-fuzzy-target-buffer nil)
     (remove-hook 'window-configuration-change-hook