Commit dea0a87d authored by Miles Bader's avatar Miles Bader
Browse files

(file-cache-directory-name, file-cache-minibuffer-complete):

  Ignore the minibuffer prompt.

From Milan Zamazal <Milan.Zamazal@qbizm.com>:
(file-cache-minibuffer-complete): Don't try to delete the minibuffer prompt.
parent b90d06b0
2000-12-01 Miles Bader <miles@gnu.org>
* simple.el (minibuffer-contents)
(minibuffer-contents-no-properties, delete-minibuffer-contents):
New functions.
* filecache.el (file-cache-directory-name)
(file-cache-minibuffer-complete): Ignore the minibuffer prompt.
From Milan Zamazal <Milan.Zamazal@qbizm.com>:
* filecache.el (file-cache-minibuffer-complete): Don't try to
delete the minibuffer prompt.
2000-11-30 Dave Love <fx@gnu.org>
* cus-start.el: Fix read-buffer-function type.
......
......@@ -5,7 +5,7 @@
;; Keywords: convenience
;; 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.
......@@ -446,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
......@@ -503,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)
......@@ -513,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)
(delete-region (minibuffer-prompt-end) (point-max))
(delete-minibuffer-contents)
(insert-string file-cache-string)
(if file-cache-multiple-directory-message
(file-cache-temp-minibuffer-message
......@@ -531,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
(delete-region (minibuffer-prompt-end) (point-max))
(delete-minibuffer-contents)
(insert-string (file-cache-file-name completion-string))
(setq file-cache-last-completion nil)
)
......@@ -557,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)
(delete-region (minibuffer-prompt-end) (point-max))
(delete-minibuffer-contents)
(insert-string file-cache-string)
(if file-cache-multiple-directory-message
(file-cache-temp-minibuffer-message
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment