(Info-search): Print the default as part of the prompt.

[gnu-emacs] / lisp / filecache.el

diff --git a/lisp/filecache.el b/lisp/filecache.el
index 5af516179c530951bf3d68a3af1217ead9c86460..e421e5dd8f0f1f34b77e6c923903e06bca10e43d 100644 (file)
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -3,9 +3,9 @@
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Nov 10 1996
 ;; Keywords: convenience
-;; Time-stamp: <2000-08-28 16:18:03 pbreton>
+;; Time-stamp: <2000-08-31 19:44:13 pbreton>
 ;;
-;; Copyright (C) 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2000 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -324,8 +324,7 @@ Find is run in DIRECTORY."
     (call-process file-cache-find-command nil
                  (get-buffer file-cache-buffer) nil
                  dir "-name"
-                 (if (memq system-type
-                           (list 'windows-nt 'ms-dos)) "'*'" "*")
+                 (if (eq system-type 'windows-nt) "'*'" "*")
                  "-print")
     (file-cache-add-from-file-cache-buffer)))
 
@@ -447,7 +446,7 @@ or the optional REGEXP argument."
       (error "No directory found for key %s" file))
      ;; Multiple elements
      (t
-      (let* ((minibuffer-dir (file-name-directory (buffer-string)))
+      (let* ((minibuffer-dir (file-name-directory (minibuffer-contents)))
             (dir-list       (member minibuffer-dir directory-list))
             )
        (setq directory
@@ -504,7 +503,7 @@ the name is considered already unique; only the second substitution
       (
        (completion-ignore-case file-cache-completion-ignore-case)
        (case-fold-search       file-cache-case-fold-search)
-       (string                 (file-name-nondirectory (buffer-string)))
+       (string                 (file-name-nondirectory (minibuffer-contents)))
        (completion-string      (try-completion string file-cache-alist))
        (completion-list)
        (len)
@@ -514,9 +513,9 @@ the name is considered already unique; only the second substitution
      ;; If it's the only match, replace the original contents
      ((or arg (eq completion-string t))
       (setq file-cache-string (file-cache-file-name string))
-      (if (string= file-cache-string (buffer-string))
+      (if (string= file-cache-string (minibuffer-contents))
          (file-cache-temp-minibuffer-message file-cache-sole-match-message)
-       (erase-buffer)
+       (delete-minibuffer-contents)
        (insert-string file-cache-string)
        (if file-cache-multiple-directory-message
            (file-cache-temp-minibuffer-message
@@ -532,7 +531,7 @@ the name is considered already unique; only the second substitution
          (if (and (eq last-command this-command)
                   (string= file-cache-last-completion completion-string))
              (progn
-               (erase-buffer)
+               (delete-minibuffer-contents)
                (insert-string (file-cache-file-name completion-string))
                (setq file-cache-last-completion nil)
                )
@@ -558,10 +557,10 @@ the name is considered already unique; only the second substitution
                )
              )
          (setq file-cache-string (file-cache-file-name completion-string))
-         (if (string= file-cache-string (buffer-string))
+         (if (string= file-cache-string (minibuffer-contents))
              (file-cache-temp-minibuffer-message
               file-cache-sole-match-message)
-           (erase-buffer)
+           (delete-minibuffer-contents)
            (insert-string file-cache-string)
            (if file-cache-multiple-directory-message
                (file-cache-temp-minibuffer-message