(sgml-font-lock-keywords-2): Add flag to merge with existing fontification.

[gnu-emacs] / lisp / filecache.el

diff --git a/lisp/filecache.el b/lisp/filecache.el
index e421e5dd8f0f1f34b77e6c923903e06bca10e43d..72ef62fc650fb8185cb30ef9803a5c108e0d4f15 100644 (file)
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -1,9 +1,8 @@
-;;; filecache.el --- Find files using a pre-loaded cache
+;;; filecache.el --- find files using a pre-loaded cache
 ;;
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Nov 10 1996
 ;; Keywords: convenience
-;; Time-stamp: <2000-08-31 19:44:13 pbreton>
 ;;
 ;; Copyright (C) 1996, 2000 Free Software Foundation, Inc.
 
@@ -516,7 +515,7 @@ the name is considered already unique; only the second substitution
       (if (string= file-cache-string (minibuffer-contents))
          (file-cache-temp-minibuffer-message file-cache-sole-match-message)
        (delete-minibuffer-contents)
-       (insert-string file-cache-string)
+       (insert file-cache-string)
        (if file-cache-multiple-directory-message
            (file-cache-temp-minibuffer-message
             file-cache-multiple-directory-message))
@@ -532,7 +531,7 @@ the name is considered already unique; only the second substitution
                   (string= file-cache-last-completion completion-string))
              (progn
                (delete-minibuffer-contents)
-               (insert-string (file-cache-file-name completion-string))
+               (insert (file-cache-file-name completion-string))
                (setq file-cache-last-completion nil)
                )
            (file-cache-temp-minibuffer-message file-cache-non-unique-message)
@@ -544,7 +543,7 @@ the name is considered already unique; only the second substitution
        (if (> len 1)
            (progn
              (goto-char (point-max))
-             (insert-string
+             (insert
               (substring completion-string (length string)))
              ;; Add our own setup function to the Completions Buffer
              (let ((completion-setup-hook
@@ -561,7 +560,7 @@ the name is considered already unique; only the second substitution
              (file-cache-temp-minibuffer-message
               file-cache-sole-match-message)
            (delete-minibuffer-contents)
-           (insert-string file-cache-string)
+           (insert file-cache-string)
            (if file-cache-multiple-directory-message
                (file-cache-temp-minibuffer-message
                 file-cache-multiple-directory-message)))