Mercurial > emacs

changeset 34072:24c9291f8fa8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Miles Bader <miles@gnu.org>
date Fri, 01 Dec 2000 03:33:28 +0000
parents e54fa77a9d6e
children e07466f681ae
files lisp/filecache.el
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/filecache.el	Fri Dec 01 03:31:49 2000 +0000
+++ b/lisp/filecache.el	Fri Dec 01 03:33:28 2000 +0000
@@ -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 @@
       (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 @@
       (
        (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 @@
      ;; 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 @@
 	  (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 @@
 		)
 	      )
 	  (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