X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=8252fb119336bf109a7ad5b2bee7a81f1a29c494;hb=8375c6b09c4c3a296cca277cb5d49f22f4300f80;hp=701158c50501813aa36b028b55341738a4cae5e9;hpb=5f3ddf974129507207ffb350e6639334313cca35;p=gnus

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 701158c50..8252fb119 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -186,7 +186,6 @@ fixed in Emacs 22."
 
 (defalias 'device-sound-enabled-p 'ignore)
 (defalias 'play-sound-file 'ignore)
-(defalias 'nndb-request-article 'ignore)
 (defalias 'efs-re-read-dir 'ignore)
 (defalias 'ange-ftp-re-read-dir 'ignore)
 (defalias 'define-mail-user-agent 'ignore)
@@ -316,7 +315,7 @@ dgnushack-compile."
     ;; installed.
     (when (featurep 'xemacs)
       (setq gnus-xmas-glyph-directory "dummy"))
-    (dolist (file '("dgnushack.el" "lpath.el"))
+    (dolist (file '(".dir-locals.el" "dgnushack.el" "lpath.el"))
       (setq files (delete file files)))
     (when (featurep 'base64)
       (setq files (delete "base64.el" files)))
@@ -327,6 +326,8 @@ dgnushack-compile."
        (dolist (file '("webmail.el" "nnwfm.el"))
 	 (setq files (delete file files)))))
     (condition-case code
+	;; Under XEmacs 21.4 this loads easy-mmode.elc that provides
+	;; the Emacs functions `propertize' and `replace-regexp-in-string'.
 	(require 'mh-e)
       (error
        (message "No mh-e: %s %s" (cadr code) (or (locate-library "mh-e") ""))
@@ -366,7 +367,7 @@ dgnushack-compile."
       (expand-file-name "auto-autoloads.el")
     (expand-file-name "gnus-load.el")))
 
-(defvar	dgnushack-cus-load-file 
+(defvar	dgnushack-cus-load-file
   (if (featurep 'xemacs)
       (expand-file-name "custom-load.el")
     (expand-file-name "cus-load.el")))
@@ -374,9 +375,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))))
@@ -405,7 +413,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)
@@ -551,5 +566,3 @@ or remove them using `make remove-installed-shadows'.\n\n"))))))))
 	(setq path (cdr path))))))
 
 ;;; dgnushack.el ends here
-
-;;; arch-tag: 579f585a-24eb-4e1c-8d34-4808e11b68f2