From 580d3c78937bfb654ba0e8e348d73ad1cca09ac4 Mon Sep 17 00:00:00 2001 From: "Tom Breton (Tehom)" Date: Fri, 12 Nov 2010 19:11:31 -0500 Subject: [PATCH] New spec head "matching". Changed comments. Bugfixes. --- elinstall.el | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/elinstall.el b/elinstall.el index 4775854..4798c69 100644 --- a/elinstall.el +++ b/elinstall.el @@ -994,6 +994,7 @@ Recurse just if RECURSE-DIRS-P" (if (consp spec) (case (car spec) (in + ;;in FN SPEC (let ((new-dir (expand-file-name @@ -1005,6 +1006,7 @@ Recurse just if RECURSE-DIRS-P" new-dir))) (all + ;;all SPEC* (apply #'nconc (mapcar #'(lambda (sub-spec) @@ -1012,15 +1014,28 @@ Recurse just if RECURSE-DIRS-P" sub-spec dir)) (cdr spec)))) - + (matching + ;;matching PATTERN SPEC + (apply #'nconc + (mapcar + #'(lambda (dir) + (elinstall-find-actions-by-spec-x + (third spec) + dir)) + (directory-files + dir t (second spec)))) + ) (file + ;;file FN (elinstall-actions-for-source-file - filename dir)) + (second spec) dir)) + ;;$$ADD ME control, rather than trying to bind all control ;;variables so we can safely bind one, will use set and ;;unwind-protect. (dir + ;;dir FN (elinstall-actions-for-dir (expand-file-name (second spec) @@ -1029,14 +1044,18 @@ Recurse just if RECURSE-DIRS-P" (load-path + ;;load-path SPEC (append `((add-to-load-path ,def-file ,dir)) (let ((load-path-element dir)) - (elinstall-find-actions-by-spec-x spec dir)))) + (elinstall-find-actions-by-spec-x + (second spec) + dir)))) (def-file + ;;def-file FN ARGS SPEC (let ((def-file (expand-file-name @@ -1057,6 +1076,7 @@ Recurse just if RECURSE-DIRS-P" (elinstall-find-actions-by-spec-x (fourth spec) dir))))) + ;;Single symbols (case spec (dir (elinstall-actions-for-dir dir nil)) -- 2.11.4.GIT