From da25cd04214b518d15446f19bdce18bb196e9e5b Mon Sep 17 00:00:00 2001 From: "Tom Breton (Tehom)" Date: Sat, 11 Dec 2010 17:51:15 -0500 Subject: [PATCH] Bugfix: file names are now absolute --- elinstall.el | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/elinstall.el b/elinstall.el index e1d51cc..cd698de 100644 --- a/elinstall.el +++ b/elinstall.el @@ -864,7 +864,8 @@ DIR should be an absolute path." The following files are omitted: * Dot files * Files that match an entry in `block-in-subtree'" - + (declare (special + def-file block-in-dir block-in-subtree)) (let* ( ;;Relative filenames of this directory's files. @@ -1004,10 +1005,14 @@ Recurse just if RECURSE-DIRS-P" (delq nil (mapcar #'(lambda (filename) + (let + ((fn (expand-file-name + filename + dirname))) (if - (file-directory-p filename) - (expand-file-name filename dirname) - nil)) + (file-directory-p fn) + fn + nil))) files)) '())) @@ -1076,7 +1081,14 @@ Recurse just if RECURSE-DIRS-P" sub-spec dir)) (cdr spec)))) - + (block-in-subtree + ;;(block-in-subtree (* FN) SPEC) + (let + ((block-in-subtree (second spec))) + (elinstall-find-actions-by-spec-x + (third spec) + dir))) + ;;Rather than trying to bind all control variables each time ;;thru, we use `set' and `unwind-protect'. (control @@ -1090,7 +1102,7 @@ Recurse just if RECURSE-DIRS-P" (set old-value (symbol-value key)) (set key (third spec)) (elinstall-find-actions-by-spec-x - (second spec) + (fourth spec) dir)) (set key old-value)) (error "Unrecognized control variable %s" key)))) @@ -1197,8 +1209,8 @@ Recurse just if RECURSE-DIRS-P" (recurse-dirs-p t) (force-recompile-p nil) (compile-p t) - (block-in-dir) - (block-in-subtree)) + (block-in-dir '()) + (block-in-subtree '(".git" "RCS" "CVS" "SVN" "^tests\.el"))) (declare (special load-path-element def-file add-to-load-path-p -- 2.11.4.GIT