From 3ca51a9a47a54babe00b9f55fd471fdf0fe4d969 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Mon, 6 Sep 2010 05:09:14 +0000 Subject: [PATCH] dgnushack.el (dgnushack-compile, dgnushack-make-cus-load, dgnushack-make-auto-load): Exclude .dir-locals.el file. --- lisp/ChangeLog | 3 +++ lisp/dgnushack.el | 25 ++++++++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1bc7f3e50..24240e5f9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2010-09-06 Katsumi Yamaoka + * dgnushack.el (dgnushack-compile, dgnushack-make-cus-load) + (dgnushack-make-auto-load): Exclude .dir-locals.el file. + * pop3.el: Require cl when compiling. (pop3-number-of-responses): Search for "+OK", not "+OK ". diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index ee4410ac1..dc256bb37 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -308,7 +308,8 @@ dgnushack-compile." (unless warn (setq byte-compile-warnings '(free-vars unresolved callargs redefine))) - (let ((files (directory-files srcdir nil "^[^=].*\\.el$")) + (let ((files (delete ".dir-locals.el" + (directory-files srcdir nil "^[^=].*\\.el$"))) ;;(byte-compile-generate-call-tree t) file elc) ;; Avoid barfing (from gnus-xmas) because the etc directory is not yet @@ -373,9 +374,16 @@ dgnushack-compile." (defun dgnushack-make-cus-load () (load "cus-dep") (let ((cusload-base-file dgnushack-cus-load-file)) - (if (fboundp 'custom-make-dependencies) - (custom-make-dependencies) - (Custom-make-dependencies)) + (defadvice directory-files (after exclude-dir-locals activate) + "Exclude .dir-locals.el file." + (dolist (file ad-return-value) + (if (string-match "/?\\.dir-locals\\.el\\'" file) + (setq ad-return-value (delete file ad-return-value))))) + (unwind-protect + (if (fboundp 'custom-make-dependencies) + (custom-make-dependencies) + (Custom-make-dependencies)) + (ad-unadvise 'directory-files)) (when (featurep 'xemacs) (message "Compiling %s..." dgnushack-cus-load-file) (byte-compile-file dgnushack-cus-load-file)))) @@ -404,7 +412,14 @@ dgnushack-compile." (delete-file generated-autoload-file)) (with-temp-file generated-autoload-file (insert ?\014))) - (batch-update-autoloads))) + (defadvice directory-files (after exclude-dir-locals activate) + "Exclude .dir-locals.el file." + (dolist (file ad-return-value) + (if (string-match "/?\\.dir-locals\\.el\\'" file) + (setq ad-return-value (delete file ad-return-value))))) + (unwind-protect + (batch-update-autoloads) + (ad-unadvise 'directory-files)))) (defun dgnushack-make-load () (unless (featurep 'xemacs) -- 2.25.1