From 9d0a44cab80cdba07e087394a865f3ecd5e86767 Mon Sep 17 00:00:00 2001 From: "Tom Breton (Tehom)" Date: Sat, 11 Dec 2010 14:52:49 -0500 Subject: [PATCH] elinstall-actions-for-dir starting to find files differently. --- elinstall.el | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/elinstall.el b/elinstall.el index 500ece9..2d39634 100644 --- a/elinstall.el +++ b/elinstall.el @@ -950,9 +950,30 @@ Recurse just if RECURSE-DIRS-P" ;;treat/not treat them conditional on control variables. (let* ( - ;;Relative filenames of the source files. We know our - ;;loaddefs.el isn't really source so remove it. We'd have - ;;removed it anyways after seeing file local vars. + ;;Relative filenames of the source files. + (all-files + ;; Don't include dot files. If user really wants to + ;;explore one he can use (dir ".NAME") or (file ".NAME") + (directory-files dirname nil "[^\\.]")) + ;;We know our def-file isn't really source so remove it. + ;;We'd have removed it anyways after seeing file local vars. + (all-files + (remove def-file all-files)) + + (all-files + (delq nil + (mapcar + #'(lambda (filename) + (if + (and + block-in-subtree + (some + #'(lambda (blocked) + (string-match blocked filename)) + block-in-subtree)) + nil + filename)) + all-files))) (elisp-source-files (remove def-file @@ -961,8 +982,7 @@ Recurse just if RECURSE-DIRS-P" nil elinstall-elisp-regexp))) ;;Absolute filenames of subdirectories. - ;;Don't accept any directories beginning with dot. If user - ;;really wants to explore one he can use `(dir ".NAME")'. + ;;Don't accept any directories beginning with dot. (sub-dirs (if recurse-dirs-p (delq nil @@ -1125,6 +1145,8 @@ Recurse just if RECURSE-DIRS-P" (apply #'nconc (mapcar #'(lambda (dir) + ;;$$PUNT Assume that `block-in-subtree' and + ;;`block-in-dir' aren't matched. (elinstall-find-actions-by-spec-x (third spec) dir)) -- 2.11.4.GIT