;;; 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>
(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)
(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)
(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")