X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=0fa112477078496b5976595727c91ada6fceb6e5;hb=27688c4fe73986a46e3f2cb9051170f41ef82f4c;hp=fe135eafea4db3b61b5aa7d001c5a57ef1381fca;hpb=3e7e4ebf8b40dc4f04a947f027d4edfe5aa6997a;p=elisp%2Fgnus.git-

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index fe135ea..0fa1124 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,6 +1,7 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; 2004, 2005
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Katsumi Yamaoka <yamaoka@jpl.org>
@@ -21,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -100,7 +101,7 @@
 
 (when (and (not (featurep 'xemacs))
 	   (= emacs-major-version 21)
-	   (= emacs-minor-version 3)
+	   (>= emacs-minor-version 3)
 	   (condition-case code
 	       (let ((byte-compile-error-on-warn t))
 		 (byte-optimize-form (quote (pop x)) t)
@@ -158,21 +159,22 @@ fixed in Emacs after 21.3."
 	  (setq ad-return-value (cons fn (nreverse backwards))))
       ad-do-it)))
 
-;; Add `early-package-load-path' to `load-path' for XEmacs.  Those paths
+;; Add `configure-package-path' to `load-path' for XEmacs.  Those paths
 ;; won't appear in `load-path' when XEmacs starts with the `-no-autoloads'
-;; option because of a bug. :<
+;; option or the `-vanilla' option because of a bug. :<
 (when (and (featurep 'xemacs)
-	   (string-match "--package-path=\\([^ ]+\\)"
-			 system-configuration-options))
+	   (boundp 'configure-package-path)
+	   (listp configure-package-path))
   (let ((paths
 	 (apply 'nconc
 		(mapcar
 		 (lambda (path)
-		   (when (file-directory-p
-			  (setq path (expand-file-name "lisp" path)))
+		   (when (and (stringp path)
+			      (not (string-equal path ""))
+			      (file-directory-p
+			       (setq path (expand-file-name "lisp" path))))
 		     (directory-files path t)))
-		 (split-string (match-string 1 system-configuration-options)
-			       "::"))))
+		 configure-package-path)))
 	path adds)
     (while paths
       (setq path (car paths)
@@ -300,6 +302,7 @@ adding the --with-addpath=FLIM_PATH option.\n"
     (autoload 'executable-find "executable")
     (autoload 'font-lock-fontify-buffer "font-lock" nil t)
     (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")
@@ -315,6 +318,8 @@ adding the --with-addpath=FLIM_PATH option.\n"
 	(autoload 'setenv "process" nil t)
       (autoload 'setenv "env" nil t))
     (autoload 'sgml-mode "psgml" nil t)
+    (autoload 'sha1 "sha1")
+    (autoload 'sha1-binary "sha1")
     (autoload 'smtpmail-send-it "smtpmail")
     (autoload 'sort-numeric-fields "sort" nil t)
     (autoload 'sort-subr "sort")