[slime-cvs] CVS slime/contrib

[CVS User sboukarev]

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

Modified Files:
	ChangeLog slime-fuzzy.el 
Log Message:
(slime-fuzzy-complete-symbol): show message in the
minibuffer after showing completion list, because completion
itself can take place in the minibuffer.
(slime-fuzzy-choices-buffer): if completion was started in the minibuffer,
don't switch to minibuffer in the other window, but select minibuffer window
instead.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/06/23 18:11:13	1.219
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/06/28 08:51:18	1.220
@@ -1,3 +1,12 @@
+2009-06-28  Stas Boukarev  <stassats at gmail.com>
+
+	* slime-fuzzy.el (slime-fuzzy-complete-symbol): show message in the
+	minibuffer after showing completion list, because completion
+	itself can take place in the minibuffer.
+	(slime-fuzzy-choices-buffer): if completion was started in the minibuffer,
+	don't switch to minibuffer in the other window, but select minibuffer window
+	instead.
+
 2009-06-23  Helmut Eller  <heller at common-lisp.net>
 
 	* swank-ikarus.ss, swank-larceny.scm, swank-r6rs.scm: New files.
--- /project/slime/cvsroot/slime/contrib/slime-fuzzy.el	2009/01/08 10:33:12	1.9
+++ /project/slime/cvsroot/slime/contrib/slime-fuzzy.el	2009/06/28 08:51:18	1.10
@@ -281,8 +281,8 @@
                  (slime-fuzzy-done))
                 ;; Incomplete
                 (t
-                 (slime-minibuffer-respecting-message "Complete but not unique")
-                 (slime-fuzzy-choices-buffer completion-set interrupted-p beg end)))))))
+                 (slime-fuzzy-choices-buffer completion-set interrupted-p beg end)
+                 (slime-minibuffer-respecting-message "Complete but not unique")))))))
 
 
 (defun slime-get-fuzzy-buffer ()
@@ -369,7 +369,9 @@
       (setq buffer-quit-function 'slime-fuzzy-abort)) ; M-Esc Esc
     (when slime-fuzzy-completion-in-place
       ;; switch back to the original buffer
-      (switch-to-buffer-other-window slime-fuzzy-target-buffer))))
+      (if (minibufferp slime-fuzzy-target-buffer)
+          (select-window (minibuffer-window))
+          (switch-to-buffer-other-window slime-fuzzy-target-buffer)))))
 
 (defun slime-fuzzy-fill-completions-buffer (completions interrupted-p)
   "Erases and fills the completion buffer with the given completions."