diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-05-15 19:31:16 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-05-15 19:31:16 -0400 |
| commit | f5ba00a6cad3b8ab8bd94e3ba566f3608f1dc02e (patch) | |
| tree | 296f04f21c9d445b0ff8fa4c3ed7959dc4748e8e | |
| parent | da547b32a6c45494ccbd2073f0491383e8864ea9 (diff) | |
| download | emacs-f5ba00a6cad3b8ab8bd94e3ba566f3608f1dc02e.tar.gz | |
custom-make-dependencies tweaks
* lisp/cus-dep.el (custom-make-dependencies): Ignore dotfiles (dir-locals).
Don't mistakenly ignore files whose basenames match a basename
from preloaded-file-list (eg cedet/ede/simple.el).
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/cus-dep.el | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8b8cb820428..c14a81b9bb0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-05-15 Glenn Morris <rgm@gnu.org> + + * cus-dep.el (custom-make-dependencies): Ignore dotfiles (dir-locals). + Don't mistakenly ignore files whose basenames match a basename + from preloaded-file-list (eg cedet/ede/simple.el). + 2013-05-15 Juri Linkov <juri@jurta.org> * isearch.el (isearch-char-by-name): Rename from diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el index 12a3211a0b0..d31568bb523 100644 --- a/lisp/cus-dep.el +++ b/lisp/cus-dep.el @@ -61,16 +61,14 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" ;; the args as directories after we are done. (while (setq subdir (pop command-line-args-left)) (message "Directory %s" subdir) - (let ((files (directory-files subdir nil "\\`[^=].*\\.el\\'")) + (let ((files (directory-files subdir nil "\\`[^=.].*\\.el\\'")) (default-directory (expand-file-name subdir)) - (preloaded (concat "\\`" - (regexp-opt (mapcar - 'file-name-base - preloaded-file-list) t) + (preloaded (concat "\\`\\(\\./+\\)?" + (regexp-opt preloaded-file-list t) "\\.el\\'"))) (dolist (file files) (unless (or (string-match custom-dependencies-no-scan-regexp file) - (string-match preloaded file) + (string-match preloaded (format "%s/%s" subdir file)) (not (file-exists-p file))) (erase-buffer) (kill-all-local-variables) |