Merge branch 'master' of http://git.gnus.org/gnus into SYgnus

[gnus] / lisp / dgnushack.el

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index ec791a8..b1203e3 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,5 +1,5 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Version: 4.19
@@ -272,7 +272,7 @@ in `defcustom' forms."
       (when (and (eq last (third form))
                 (consp last)
                 (eq 'mapcar (car last))
-                (equal (nth 1 form) ''nconc))
+                (member (nth 1 form) '('nconc #'nconc)))
        (setq form (cons 'mapcan (cdr last)))))))
 
 (if (featurep 'emacs)
@@ -345,6 +345,26 @@ This means that every warning will be reported as an error."
       (setq files (delete "gnus-icalendar.el" files))
       ;; Temporary during development.
       (setq files (delete "gnus-cloud.el" files)))
+    ;; Prefer XEmacs mail-lib pkg if installed
+    (when (and (featurep 'xemacs)
+              (locate-library "mail-lib/_pkg"))
+      (dolist (file
+              '("rfc2104.el" "netrc.el" "pop3.el" "starttls.el" "tls.el"))
+       (setq files (delete file files))))
+    ;; Prefer XEmacs ecrypto pkg if installed
+    (when (and (featurep 'xemacs)
+              (locate-library "ecrypto/_pkg"))
+      (dolist (file '("md4.el" "sha1.el" "hex-util.el"))
+       (setq files (delete file files))))
+    ;; Prefer XEmacs net-utils pkg if installed
+    (when (and (featurep 'xemacs)
+              (locate-library "net-utils/_pkg"))
+      (dolist (file '("dig.el" "dns.el" "dns-mode.el"))
+       (setq files (delete file files))))
+    ;; Prefer XEmacs text-modes pkg if installed
+    (when (and (featurep 'xemacs)
+              (locate-library "text-modes/_pkg"))
+      (setq files (delete "format-spec.el" files)))
     (dolist (file files)
       (setq file (expand-file-name file srcdir))
       (when (and (file-exists-p