X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/872faefb07a9196a583fc8cbe146ab6a2ebc9c2b..026b174672c427b035009911de305992a94098d6:/lisp/filecache.el

diff --git a/lisp/filecache.el b/lisp/filecache.el
index ae3cb8d074..7d12517fcc 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -1,6 +1,6 @@
 ;;; filecache.el --- find files using a pre-loaded cache
 
-;; Copyright (C) 1996, 2000-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2000-2014 Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Nov 10 1996
@@ -453,8 +453,9 @@ message reporting the number of file names deleted."
     (dolist (f files)
       (if (file-cache-delete-file f)
 	  (setq n (1+ n))))
-    (message "Filecache: uncached %d file name%s."
-	     n (if (= n 1) "" "s"))))
+    (when message
+      (message "Filecache: uncached %d file name%s."
+	       n (if (= n 1) "" "s")))))
 
 (defun file-cache-delete-file-regexp (regexp)
   "Delete files matching REGEXP from the file cache."
@@ -612,7 +613,9 @@ the name is considered already unique; only the second substitution
                      (append completion-setup-hook
                              (list 'file-cache-completion-setup-function))))
 		(with-output-to-temp-buffer file-cache-completions-buffer
-		  (display-completion-list completion-list string))))
+		  (display-completion-list
+                   (completion-hilit-commonality completion-list
+                                                 (length string))))))
 	  (setq file-cache-string (file-cache-file-name completion-string))
 	  (if (string= file-cache-string (minibuffer-contents))
 	      (minibuffer-message file-cache-sole-match-message)
@@ -679,10 +682,7 @@ match REGEXP."
 		"*File Cache Files Matching*")))
     (erase-buffer)
     (insert
-     (mapconcat
-      'identity
-      results
-      "\n"))
+     (mapconcat #'identity results "\n"))
     (goto-char (point-min))
     (display-buffer buf)))