[patch] 21.3 filecache.el -- Do not include directories to cache

[Jari Aalto+mail.emacs]

2004-01-24 Sat  Jari Aalto  <jari.aalto@poboxes.com>

        * filecache.el (file-cache-add-directory): Added check for
        directories; not added.


RCS file: 
/cygdrive/h/data/version-control/cvsroot/emacs/gnu-emacs/lisp213/filecache.el,v
retrieving revision 1.1.1.1
diff -u -IId: -b -w -u -r1.1.1.1 filecache.el
--- filecache.el        26 Jun 2003 18:06:09 -0000      1.1.1.1
+++ filecache.el        24 Jan 2004 08:04:56 -0000
@@ -260,16 +260,18 @@
   (if (not (file-accessible-directory-p directory))
       (message "Directory %s does not exist" directory)
     (let* ((dir       (expand-file-name directory))
-          (dir-files (directory-files dir t regexp))
+           (dir-files (directory-files dir 'full-path regexp))
           )
       ;; Filter out files we don't want to see
       (mapcar
        '(lambda (file)
+          (if (file-directory-p file)
+              (setq dir-files (delq file dir-files))
        (mapcar
         '(lambda (regexp)
            (if (string-match regexp file)
                (setq dir-files (delq file dir-files))))
-        file-cache-filter-regexps))
+             file-cache-filter-regexps)))
        dir-files)
       (file-cache-add-file-list dir-files))))