X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=a008d1165348fde505e2b9a1ef638770987ee747;hb=0f63151c0cfcb3498678c203edb84e6a1d2b57e0;hp=751ec602628156f22fe6a08ac60e2cbf9d8b564e;hpb=aacbff163657c784c9bc5897d32b229d7bfa08cd;p=gnus

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 751ec6026..a008d1165 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,6 +1,6 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003,
-;; 2004, 2005, 2006, 2007
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -62,7 +62,7 @@
   (setq filename (byte-compiler-base-file-name filename))
   (setq filename (file-name-sans-versions filename))
   (setq filename (file-name-nondirectory filename))
-  (if (memq system-type '(win32 w32 mswindows windows-nt))
+  (if (eq system-type 'windows-nt)
       (setq filename (downcase filename)))
   (cond ((eq system-type 'vax-vms)
 	 (concat (substring filename 0 (string-match ";" filename)) "c"))
@@ -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)
@@ -203,8 +202,14 @@ fixed in Emacs 22."
     (unless (fboundp 'defadvice)
       (autoload 'defadvice "advice" nil nil 'macro))
     (autoload 'Info-directory "info" nil t)
+    (autoload 'Info-index "info" nil t)
+    (autoload 'Info-index-next "info" nil t)
     (autoload 'Info-menu "info" nil t)
     (autoload 'ad-add-advice "advice")
+    (unless (and (emacs-version>= 21 5)
+		 (not (featurep 'sxemacs)))
+      ;; calendar/auto-autoloads.el provides it.
+      (autoload 'add-to-invisibility-spec "dummy"))
     (autoload 'annotations-at "annotations")
     (autoload 'apropos "apropos" nil t)
     (autoload 'apropos-command "apropos" nil t)
@@ -217,16 +222,27 @@ fixed in Emacs 22."
     (autoload 'customize-save-variable "cus-edit" nil t)
     (autoload 'customize-set-variable "cus-edit" nil t)
     (autoload 'customize-variable "cus-edit" nil t)
+    (autoload 'debug "debug" nil t)
+    (if (featurep 'mule)
+	(unless (locate-library "mule-ccl")
+	  (autoload 'define-ccl-program "ccl" nil nil 'macro))
+      (defalias 'define-ccl-program 'ignore))
     (autoload 'delete-annotation "annotations")
     (autoload 'dolist "cl-macs" nil nil 'macro)
     (autoload 'enriched-decode "enriched")
+    (autoload 'eudc-expand-inline "eudc" nil t)
     (autoload 'executable-find "executable")
     (autoload 'font-lock-fontify-buffer "font-lock" nil t)
+    (when (and (emacs-version>= 21 5)
+	       (not (featurep 'sxemacs)))
+      (autoload 'get-display-table "disp-table")
+      (autoload 'put-display-table "disp-table"))
     (autoload 'info "info" nil t)
     (autoload 'mail-extract-address-components "mail-extr")
     (autoload 'mail-fetch-field "mail-utils")
     (autoload 'make-annotation "annotations")
     (autoload 'make-display-table "disp-table")
+    (autoload 'pgg-snarf-keys-region "pgg" nil t)
     (autoload 'pp "pp")
     (autoload 'ps-despool "ps-print" nil t)
     (autoload 'ps-spool-buffer "ps-print" nil t)
@@ -242,6 +258,7 @@ fixed in Emacs 22."
     (autoload 'smtpmail-send-it "smtpmail")
     (autoload 'sort-numeric-fields "sort" nil t)
     (autoload 'sort-subr "sort")
+    (autoload 'thing-at-point "thingatpt")
     (autoload 'toggle-truncate-lines "view-less" nil t)
     (autoload 'trace-function-background "trace" nil t)
     (autoload 'unmorse-region "morse" nil t)
@@ -261,6 +278,24 @@ fixed in Emacs 22."
     (defalias 'replace-highlight 'ignore)
     (defalias 'w3-coding-system-for-mime-charset 'ignore)))
 
+(defun dgnushack-emacs-compile-defcustom-p ()
+  "Return non-nil if Emacs byte compiles `defcustom' forms.
+Those Emacsen will warn against undefined variables and functions used
+in `defcustom' forms."
+  (let ((outbuf (with-temp-buffer
+		  (insert "(defcustom foo (1+ (random)) \"\" :group 'emacs)\n")
+		  (byte-compile-from-buffer (current-buffer) "foo.el"))))
+    (when outbuf
+      (prog1
+	  (with-current-buffer outbuf
+	    (goto-char (point-min))
+	    (search-forward " 'foo '(byte-code " nil t))
+	(kill-buffer outbuf)))))
+
+(when (dgnushack-emacs-compile-defcustom-p)
+  (maybe-fbind '(defined-colors face-attribute))
+  (maybe-bind '(idna-program installation-directory)))
+
 (defun dgnushack-compile-verbosely ()
   "Call dgnushack-compile with warnings ENABLED.  If you are compiling
 patches to gnus, you should consider modifying make.bat to call
@@ -273,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
@@ -288,7 +324,7 @@ dgnushack-compile."
 	(require 'w3-parse)
       (error
        (message "No w3: %s %s" (cadr code) (or (locate-library "w3-parse") ""))
-       (dolist (file '("nnultimate.el" "webmail.el" "nnwfm.el"))
+       (dolist (file '("webmail.el" "nnwfm.el"))
 	 (setq files (delete file files)))))
     (condition-case code
 	(require 'mh-e)
@@ -330,7 +366,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")))
@@ -338,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))))
@@ -369,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)
@@ -515,5 +565,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