                               (- (frame-height) 3))
         (set-buffer-modified-p nil)))))
 
-(defun lusty-buffer-explorer-matches ()
-  (let* ((contents (if lusty--wrapping-ido-p
-                       ido-text
-                     (minibuffer-contents-no-properties)))
-         (buffers (lusty-filter-buffers (buffer-list))))
+(defun lusty-buffer-explorer-matches (text)
+  (let* ((buffers (lusty-filter-buffers (buffer-list))))
     (lusty-sort-by-fuzzy-score 
      buffers
-     contents)))
-
-(defun lusty-file-explorer-matches ()
-  (let* ((path (minibuffer-contents-no-properties))
-         (dir (lusty-normalize-dir (file-name-directory path)))
+     text)))
+
+(defun lusty-file-explorer-matches (path)
+  (let* ((dir (lusty-normalize-dir (file-name-directory path)))
          (file-portion (file-name-nondirectory path))
          (files
           (and dir

  ;; Window configuration may be restored intermittently.
  (setq lusty--initial-window-config (current-window-configuration)))

(defun lusty-update-matches-buffer ()
  (assert (minibufferp))
  (let ((matches
         (ecase lusty--active-mode
           (:file-explorer (lusty-file-explorer-matches))
           (:buffer-explorer (lusty-buffer-explorer-matches)))))
    (setq lusty--previous-printed-matches matches)
    ;;
    ;; Update the completion window.
    ;; STEVE should not intermingle truncation and buffer update
    ;; STEVE - first half, get entries; second half, display
    (let ((lusty-buffer (get-buffer-create lusty-buffer-name)))
      (with-current-buffer lusty-buffer
        (setq buffer-read-only t)
        (multiple-value-bind (truncated-matches truncated-p)
            (lusty-truncate-entries matches)
          (let ((buffer-read-only nil))
            (erase-buffer)
            (lusty-display-entries truncated-matches truncated-p)
            (goto-char (point-min))))

        ;; If only our matches window is open,


;;;###autoload
(defun lusty-buffer-explorer ()
  "Launch the buffer mode of LustyExplorer."
  (interactive)
  (let* ((lusty--active-mode :buffer-explorer)
         (minibuffer-local-completion-map lusty-mode-map)
