procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* filecache.el (file-cache-add-file): Handle relative file name in the argument.

Browse source 
Fixes: debbugs:12694
This commit is contained in:
Chong Yidong 2012-11-17 14:16:46 +08:00
parent a33da68be0
commit ec15e0ff0b
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-11-17 Chong Yidong <cyd@gnu.org>
* filecache.el (file-cache-add-file): Handle relative file name in
the argument (Bug#12694).
2012-11-16 Jürgen Hötzel <juergen@archlinux.org> (tiny change)
* eshell/em-unix.el (eshell/mkdir): Handle "--parents" (bug#12897).

33
lisp/filecache.el
View file

@ -310,23 +310,22 @@ files in each directory, not to the directory list itself."
(defun file-cache-add-file (file)
"Add FILE to the file cache."
(interactive "fAdd File: ")
(if (not (file-exists-p file))
(message "Filecache: file %s does not exist" file)
(let* ((file-name (file-name-nondirectory file))
(dir-name (file-name-directory file))
(the-entry (assoc-string
file-name file-cache-alist
file-cache-ignore-case)))
;; Does the entry exist already?
(if the-entry
(if (or (and (stringp (cdr the-entry))
(string= dir-name (cdr the-entry)))
(and (listp (cdr the-entry))
(member dir-name (cdr the-entry))))
nil
(setcdr the-entry (cons dir-name (cdr the-entry))))
;; If not, add it to the cache
(push (list file-name dir-name) file-cache-alist)))))
(setq file (file-truename file))
(unless (file-exists-p file)
(error "Filecache: file %s does not exist" file))
(let* ((file-name (file-name-nondirectory file))
(dir-name (file-name-directory file))
(the-entry (assoc-string file-name file-cache-alist
file-cache-ignore-case)))
;; Does the entry exist already?
(if the-entry
(unless (or (and (stringp (cdr the-entry))
(string= dir-name (cdr the-entry)))
(and (listp (cdr the-entry))
(member dir-name (cdr the-entry))))
(setcdr the-entry (cons dir-name (cdr the-entry))))
;; If not, add it to the cache
(push (list file-name dir-name) file-cache-alist))))
;;;###autoload
(defun file-cache-add-directory-using-find (directory)