;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;; 2004, 2005
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; 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:
(if (memq 'shift-jis (coding-priority-list))
(set-coding-priority-list
(append (delq 'shift-jis (coding-priority-list)) '(shift-jis)))))
- ((boundp 'MULE)
- (put '*coding-category-sjis* 'priority (length *predefined-category*)))
((featurep 'mule)
(if (memq 'coding-category-sjis coding-category-list)
(set-coding-priority
(copy-sequence coding-category-list))
'(coding-category-sjis))))))
+(defvar dgnushack-default-load-path (copy-sequence load-path))
+
(defalias 'facep 'ignore)
(require 'cl)
(load "cl-macs" nil t))
(defvar srcdir (or (getenv "srcdir") "."))
+(defvar loaddir (and load-file-name (file-name-directory load-file-name)))
(defvar dgnushack-w3-directory (let ((w3dir (getenv "W3DIR")))
(unless (zerop (length w3dir))
; (cons 'progn (cdr form)))
;(defalias 'byte-compile-file-form-defsubst 'byte-compile-file-form-defun)
-(when (boundp 'MULE)
- (let (current-load-list)
- ;; Make the function to be silent at compile-time.
- (defun locate-library (library &optional nosuffix)
- "Show the full path name of Emacs library LIBRARY.
-This command searches the directories in `load-path' like `M-x load-library'
-to find the file that `M-x load-library RET LIBRARY RET' would load.
-Optional second arg NOSUFFIX non-nil means don't add suffixes `.elc' or `.el'
-to the specified name LIBRARY (a la calling `load' instead of `load-library')."
- (interactive "sLocate library: ")
- (catch 'answer
- (mapcar
- '(lambda (dir)
- (mapcar
- '(lambda (suf)
- (let ((try (expand-file-name (concat library suf) dir)))
- (and (file-readable-p try)
- (null (file-directory-p try))
- (progn
- (or noninteractive
- (message "Library is file %s" try))
- (throw 'answer try)))))
- (if nosuffix '("") '(".elc" ".el" ""))))
- load-path)
- (or noninteractive
- (message "No library %s in search path" library))
- nil))
- (byte-compile 'locate-library)))
-
-(setq max-specpdl-size 3000)
-
-(when (equal
- (cadr
- (byte-optimize-form
- '(and
- (< 0 1)
- (message "The subform `(< 0 1)' should be optimized to t"))
- 'for-effect))
- '(< 0 1))
+(when (and (not (featurep 'xemacs))
+ (= emacs-major-version 21)
+ (>= emacs-minor-version 3)
+ (condition-case code
+ (let ((byte-compile-error-on-warn t))
+ (byte-optimize-form (quote (pop x)) t)
+ nil)
+ (error (string-match "called for effect"
+ (error-message-string code)))))
+ (defadvice byte-optimize-form-code-walker (around silence-warn-for-pop
+ (form for-effect)
+ activate)
+ "Silence the warning \"...called for effect\" for the `pop' form.
+It is effective only when the `pop' macro is defined by cl.el rather
+than subr.el."
+ (let (tmp)
+ (if (and (eq (car-safe form) 'car)
+ for-effect
+ (setq tmp (get 'car 'side-effect-free))
+ (not byte-compile-delete-errors)
+ (not (eq tmp 'error-free))
+ (eq (car-safe (cadr form)) 'prog1)
+ (let ((var (cadr (cadr form)))
+ (last (nth 2 (cadr form))))
+ (and (symbolp var)
+ (null (nthcdr 3 (cadr form)))
+ (eq (car-safe last) 'setq)
+ (eq (cadr last) var)
+ (eq (car-safe (nth 2 last)) 'cdr)
+ (eq (cadr (nth 2 last)) var))))
+ (progn
+ (put 'car 'side-effect-free 'error-free)
+ (unwind-protect
+ ad-do-it
+ (put 'car 'side-effect-free tmp)))
+ ad-do-it))))
+
+(when (and (not (featurep 'xemacs))
+ (byte-optimize-form '(and (> 0 1) foo) t))
(defadvice byte-optimize-form-code-walker
(around fix-bug-in-and/or-forms (form for-effect) activate)
- "Fix a bug in the optimizing and/or forms.
-It has already been fixed in XEmacs since 1999-12-06."
+ "Optimize the rest of the and/or forms.
+It has been fixed in XEmacs before releasing 21.4 and also has been
+fixed in Emacs after 21.3."
(if (and for-effect (memq (car-safe form) '(and or)))
(let ((fn (car form))
(backwards (reverse (cdr form))))
(setq ad-return-value (cons fn (nreverse backwards))))
ad-do-it)))
-(condition-case nil
- (char-after)
- (wrong-number-of-arguments
- ;; Optimize byte code for `char-after'.
- (put 'char-after 'byte-optimizer 'byte-optimize-char-after)
- (defun byte-optimize-char-after (form)
- (if (null (cdr form))
- '(char-after (point))
- form))))
-
-(condition-case nil
- (char-before)
- (wrong-number-of-arguments
- ;; Optimize byte code for `char-before'.
- (put 'char-before 'byte-optimizer 'byte-optimize-char-before)
- (defun byte-optimize-char-before (form)
- (if (null (cdr form))
- '(char-before (point))
- form))))
-
-(load (expand-file-name "dgnuspath.el" srcdir) nil nil t)
+;; 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 or the `-vanilla' option because of a bug. :<
+(when (and (featurep 'xemacs)
+ (boundp 'configure-package-path)
+ (listp configure-package-path))
+ (let ((paths
+ (apply 'nconc
+ (mapcar
+ (lambda (path)
+ (when (and (stringp path)
+ (not (string-equal path ""))
+ (file-directory-p
+ (setq path (expand-file-name "lisp" path))))
+ (directory-files path t)))
+ configure-package-path)))
+ path adds)
+ (while paths
+ (setq path (car paths)
+ paths (cdr paths))
+ (when (and path
+ (not (or (string-match "/\\.\\.?\\'" path)
+ (member (file-name-as-directory path) load-path)
+ (member path load-path)))
+ (file-directory-p path))
+ (push (file-name-as-directory path) adds)))
+ (setq load-path (nconc (nreverse adds) load-path))))
+
+(if (file-exists-p (expand-file-name "dgnuspath.el" srcdir))
+ (load (expand-file-name "dgnuspath.el" srcdir) nil nil t))
(condition-case err
(load "~/.lpath.el" t nil t)
(error (message "Error in \"~/.lpath.el\" file: %s" err)))
+(when (featurep 'xemacs)
+ (condition-case nil
+ (require 'timer-funcs)
+ (error "
+You should upgrade your XEmacs packages, especially xemacs-base.\n"))
+
+ ;; The reason that to load `advice' is necessary is:
+ ;; 1. `path-util' loads poe.elc.
+ ;; 2. poe.elc requires the `ad-add-advice' function which is expanded
+ ;; from `defadvice'.
+ ;; 3. XEmacs is running with the -no-autoloads option.
+ (require 'advice))
+
;; Don't load path-util until `char-after' and `char-before' have been
;; optimized because it requires `poe' and then modify the functions.
-
-;; If the APEL modules are installed under the non-standard directory,
-;; for example "/var/home/john/lisp/apel-VERSION/", you should add that
-;; name using the configure option "--with-addpath=".
-;; And also the directory where the EMU modules are installed, for
-;; example "/usr/local/share/mule/19.34/site-lisp/", it should be
-;; included in the standard `load-path' or added by the configure
-;; option "--with-addpath=".
-(let ((path (or (locate-library "path-util")
- (locate-library "apel/path-util")));; backward compat.
- parent lpath)
- (if path
- (progn
- (when (string-match "/$" (setq path (file-name-directory path)))
- (setq path (substring path 0 (match-beginning 0))))
- ;; path == "/var/home/john/lisp/apel-VERSION"
- (when (string-match "/$" (setq parent (file-name-directory path)))
- (setq parent (substring path 0 (match-beginning 0))))
- ;; parent == "/var/home/john/lisp"
- (if (setq lpath (or (member path load-path)
- (member (file-name-as-directory path) load-path)))
- (unless (or (member parent load-path)
- (member (file-name-as-directory parent) load-path))
- (push parent (cdr lpath)))
- (push path load-path)
- (unless (or (member parent load-path)
- (member (file-name-as-directory parent) load-path))
- (push parent (cdr load-path))))
- (require 'advice)
- (require 'path-util))
- (error "
-APEL modules are not found in %s.
-Try to re-configure with --with-addpath=APEL_PATH and run make again.
-"
- load-path)))
+(condition-case nil
+ (require 'path-util)
+ (error "\nIn %s,
+APEL was not found or an error occurred. You will need to run the
+configure script again adding the --with-addpath=APEL_PATH option.\n"
+ load-path))
(unless (locate-library "mel")
(add-path "flim"))
(file-name-directory (get-latest-path "^apel$" t)))
load-path)
(unless (module-installed-p 'mel)
- (error "
-FLIM modules does not found in %s.
-Try to re-configure with --with-addpath=FLIM_PATH and run make again.
-"
+ (error "In %s,
+FLIM was not found. You will need to run the configure script again
+adding the --with-addpath=FLIM_PATH option.\n"
load-path)))
(add-path "semi")
-(push srcdir load-path)
-(load (expand-file-name "lpath.el" srcdir) nil t t)
-
-(load (expand-file-name "gnus-clfns.el" srcdir) nil t t)
+(when (and (featurep 'xemacs)
+ (let ((table (copy-syntax-table emacs-lisp-mode-syntax-table)))
+ (modify-syntax-entry ?= " " table)
+ (with-temp-buffer
+ (with-syntax-table table
+ (insert "foo=bar")
+ (goto-char (point-min))
+ (forward-sexp 1)
+ (eolp)))))
+ ;; The original `with-syntax-table' uses `copy-syntax-table' which
+ ;; doesn't seem to copy modified syntax entries in XEmacs 21.5.
+ (defmacro with-syntax-table (syntab &rest body)
+ "Evaluate BODY with the SYNTAB as the current syntax table."
+ `(let ((stab (syntax-table)))
+ (unwind-protect
+ (progn
+ ;;(set-syntax-table (copy-syntax-table ,syntab))
+ (set-syntax-table ,syntab)
+ ,@body)
+ (set-syntax-table stab)))))
-(when (boundp 'MULE)
- ;; Bind the function `base64-encode-string' before loading canlock.
- ;; Since canlock will bind it as an autoloaded function, it causes
- ;; damage to define the function by MEL.
- (load (expand-file-name "base64.el" srcdir) nil t t)
- ;; Load special macros for compiling canlock.el.
- (load (expand-file-name "canlock-om.el" srcdir) nil t t))
+(push srcdir load-path)
+(push loaddir load-path)
+(load (expand-file-name "lpath.el" loaddir) nil t)
(require 'custom)
byte-compile-function-environment)))
form)
-(condition-case nil
- :symbol-for-testing-whether-colon-keyword-is-available-or-not
- (void-variable
- (defun dgnushack-bind-colon-keywords ()
- "Bind all the colon keywords for old Emacsen."
- (let ((cache (expand-file-name "dgnuskwds.el" srcdir))
- (makefile (expand-file-name "Makefile" srcdir))
- (buffer (get-buffer-create " *colon keywords*"))
- keywords ignores files file dirs dir form elem make-backup-files)
- (save-excursion
- (set-buffer buffer)
- (let (buffer-file-format
- format-alist
- insert-file-contents-post-hook
- insert-file-contents-pre-hook
- jam-zcat-filename-list
- jka-compr-compression-info-list)
- (if (and (file-exists-p cache)
- (file-exists-p makefile)
- (file-newer-than-file-p cache makefile))
- (progn
- (insert-file-contents cache nil nil nil t)
- (setq keywords (read buffer)))
- (setq
- ignores
- '(:symbol-for-testing-whether-colon-keyword-is-available-or-not
- ;; The following keywords will be bound by CUSTOM.
- :get :group :initialize :link :load :options :prefix
- :require :set :tag :type)
- files (list (locate-library "semi-def")
- (locate-library "mailcap")
- (locate-library "mime-def")
- (locate-library "path-util")
- (locate-library "poem"))
- dirs (list (file-name-as-directory (expand-file-name srcdir))))
- (while files
- (when (setq file (pop files))
- (setq dir (file-name-directory file))
- (unless (member dir dirs)
- (push dir dirs))))
- (message "Searching for all the colon keywords in:")
- (while dirs
- (setq dir (pop dirs))
- (message " %s..." dir)
- (setq files (directory-files dir t
- "\\.el\\(\\.gz\\|\\.bz2\\)?$"))
- (while files
- (setq file (pop files))
- (if (string-match "\\(\\.gz$\\)\\|\\.bz2$" file)
- (let ((temp (expand-file-name "dgnustemp.el" srcdir)))
- (when
- (let* ((binary (if (boundp 'MULE)
- '*noconv*
- 'binary))
- (coding-system-for-read binary)
- (coding-system-for-write binary)
- (input-coding-system binary)
- (output-coding-system binary)
- (default-process-coding-system
- (cons binary binary))
- call-process-hook)
- (insert-file-contents file nil nil nil t)
- (when
- (condition-case code
- (progn
- (if (match-beginning 1)
- (call-process-region
- (point-min) (point-max)
- "gzip" t buffer nil "-cd")
- (call-process-region
- (point-min) (point-max)
- "bzip2" t buffer nil "-d"))
- t)
- (error
- (erase-buffer)
- (message "In file %s: %s" file code)
- nil))
- (write-region (point-min) (point-max) temp
- nil 'silent)
- t))
- (unwind-protect
- (insert-file-contents temp nil nil nil t)
- (delete-file temp))))
- (insert-file-contents file nil nil nil t))
- (while (setq form (condition-case nil
- (read buffer)
- (error nil)))
- (when (listp form)
- (while form
- (setq elem (car-safe form)
- form (cdr-safe form))
- (unless (memq (car-safe elem)
- '(defcustom defface defgroup
- define-widget quote))
- (while (consp elem)
- (push (car elem) form)
- (setq elem (cdr elem)))
- (when (and elem
- (symbolp elem)
- (not (eq ': elem))
- (eq ?: (aref (symbol-name elem) 0))
- (not (memq elem ignores))
- (not (memq elem keywords)))
- (push elem keywords))))))))
- (setq keywords (sort keywords
- (lambda (a b)
- (string-lessp (symbol-name a)
- (symbol-name b)))))
- (erase-buffer)
- (insert (format "%s" keywords))
- (write-region (point-min) (point) cache nil 'silent)
- (message
- "The following colon keywords will be bound at run-time:\n %s"
- keywords))))
- (kill-buffer buffer)
- (defconst dgnushack-colon-keywords keywords)
- (while keywords
- (set (car keywords) (car keywords))
- (setq keywords (cdr keywords)))))
- (byte-compile 'dgnushack-bind-colon-keywords)
- (dgnushack-bind-colon-keywords)))
-
-(when (boundp 'MULE)
- (setq :version ':version
- :set-after ':set-after)
- (require 'custom)
- (defadvice custom-handle-keyword
- (around dont-signal-an-error-even-if-unsupported-keyword-is-given
- activate)
- "Don't signal an error even if unsupported keyword is given."
- (if (not (memq (ad-get-arg 1) '(:version :set-after)))
- ad-do-it)))
-
-(when (boundp 'MULE)
- (put 'custom-declare-face 'byte-optimizer
- 'byte-optimize-ignore-unsupported-custom-keywords)
- (put 'custom-declare-group 'byte-optimizer
- 'byte-optimize-ignore-unsupported-custom-keywords)
- (defun byte-optimize-ignore-unsupported-custom-keywords (form)
- (if (or (memq ':version (nthcdr 4 form))
- (memq ':set-after (nthcdr 4 form)))
- (let ((newform (list (car form) (nth 1 form)
- (nth 2 form) (nth 3 form)))
- (args (nthcdr 4 form)))
- (while args
- (or (memq (car args) '(:version :set-after))
- (setq newform (nconc newform (list (car args)
- (car (cdr args))))))
- (setq args (cdr (cdr args))))
- newform)
- form))
-
- (put 'custom-declare-variable 'byte-hunk-handler
- 'byte-compile-file-form-custom-declare-variable)
- (defun byte-compile-file-form-custom-declare-variable (form)
- ;; Bind defcustom'ed variables.
- (if (memq 'free-vars byte-compile-warnings)
- (setq byte-compile-bound-variables
- (cons (nth 1 (nth 1 form)) byte-compile-bound-variables)))
- (if (memq ':version (nthcdr 4 form))
- ;; Make the variable uncustomizable.
- `(defvar ,(nth 1 (nth 1 form)) ,(nth 1 (nth 2 form))
- ,(substring (nth 3 form) (if (string-match "^[\t *]+" (nth 3 form))
- (match-end 0)
- 0)))
- ;; Ignore unsupported keyword(s).
- (if (memq ':set-after (nthcdr 4 form))
- (let ((newform (list (car form) (nth 1 form)
- (nth 2 form) (nth 3 form)))
- (args (nthcdr 4 form)))
- (while args
- (or (eq (car args) ':set-after)
- (setq newform (nconc newform (list (car args)
- (car (cdr args))))))
- (setq args (cdr (cdr args))))
- newform)
- form)))
-
- (defadvice byte-compile-inline-expand (around ignore-built-in-functions
- (form) activate)
- "Ignore built-in functions."
- (let* ((name (car form))
- (fn (and (fboundp name)
- (symbol-function name))))
- (if (subrp fn)
- ;; Give up on inlining.
- (setq ad-return-value form)
- ad-do-it))))
-
;; Unknown variables and functions.
-(unless (boundp 'buffer-file-coding-system)
- (defvar buffer-file-coding-system (symbol-value 'file-coding-system)))
(unless (featurep 'xemacs)
(defalias 'Custom-make-dependencies 'ignore)
(defalias 'update-autoloads-from-directory 'ignore))
(eval-and-compile
(when (featurep 'xemacs)
- ;; XEmacs 21.1 needs some extra hand holding
- (when (eq emacs-minor-version 1)
- (autoload 'custom-declare-face "cus-face" nil t)
- (autoload 'cl-compile-time-init "cl-macs" nil t)
- (autoload 'defadvice "advice" nil nil 'macro))
(unless (fboundp 'defadvice)
(autoload 'defadvice "advice" nil nil 'macro))
(autoload 'Info-directory "info" nil t)
(autoload 'apropos-command "apropos" nil t)
(autoload 'bbdb-complete-name "bbdb-com" nil t)
(autoload 'browse-url "browse-url" nil t)
+ (autoload 'c-mode "cc-mode" nil t)
(autoload 'customize-apropos "cus-edit" nil t)
(autoload 'customize-save-variable "cus-edit" nil t)
+ (autoload 'customize-set-variable "cus-edit" nil t)
(autoload 'customize-variable "cus-edit" nil t)
(autoload 'delete-annotation "annotations")
(autoload 'dolist "cl-macs" nil nil 'macro)
(autoload 'enriched-decode "enriched")
+ (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")
(autoload 'pp "pp")
(autoload 'read-passwd "passwd")
(autoload 'regexp-opt "regexp-opt")
(autoload 'reporter-submit-bug-report "reporter")
- (if (emacs-version>= 21 5)
+ (if (and (emacs-version>= 21 5)
+ (not (featurep 'sxemacs)))
(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")
(defalias 'overlays-in 'ignore)
(defalias 'replace-dehighlight 'ignore)
(defalias 'replace-highlight 'ignore)
- (defalias 'run-with-idle-timer 'ignore)
(defalias 'w3-coding-system-for-mime-charset 'ignore)))
;; T-gnus stuff.
(autoload 'std11-unfold-region "nnheader"))
(defconst dgnushack-unexporting-files
- (append '("dgnushack.el" "dgnuspath.el" "dgnuskwds.el" "lpath.el")
- (condition-case nil
- (progn (require 'shimbun) nil)
- (error '("nnshimbun.el")))
+ (append '("dgnushack.el" "dgnuspath.el" "dgnuskwds.el" "lpath.el"
+ "legacy-gnus-agent.el")
(unless (or (condition-case code
(require 'w3-parse)
(error
'("gnus-bbdb.el")))
(unless (featurep 'xemacs)
'("gnus-xmas.el" "messagexmas.el" "nnheaderxm.el"))
- (when (and (not (featurep 'xemacs))
- (<= emacs-major-version 20))
- '("smiley.el"))
(when (and (fboundp 'base64-decode-string)
(subrp (symbol-function 'base64-decode-string)))
'("base64.el"))
(when (and (fboundp 'md5) (subrp (symbol-function 'md5)))
'("md5.el"))
- (unless (boundp 'MULE)
- '("canlock-om.el")))
+ (when (featurep 'xemacs)
+ '("gnus-load.el")))
"Files which will not be installed.")
(defconst dgnushack-exporting-files
(princ (mapconcat 'identity dgnushack-exporting-files " ")))
(defconst dgnushack-dont-compile-files
- '("mm-bodies.el" "mm-decode.el" "mm-encode.el" "mm-extern.el"
- "mm-partial.el" "mm-url.el" "mm-uu.el" "mm-view.el" "mml-sec.el"
- "mml-smime.el" "mml.el" "mml1991.el" "mml2015.el")
+ '("gnus-load.el"
+ "mm-bodies.el" "mm-decode.el" "mm-encode.el" "mm-extern.el"
+ "mm-partial.el" "mm-uu.el" "mm-view.el" "mml-sec.el" "mml-smime.el"
+ "mml.el" "mml1991.el" "mml2015.el")
"Files which should not be byte-compiled.")
(defun dgnushack-compile-verbosely ()
dgnushack-compile."
(dgnushack-compile t))
-(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
-dgnushack-compile-verbosely. All other users should continue to use
-dgnushack-compile."
- (dgnushack-compile t))
-
(defun dgnushack-compile (&optional warn)
;;(setq byte-compile-dynamic t)
(unless warn
(setq byte-compile-warnings
'(free-vars unresolved callargs redefine)))
- (unless (locate-library "cus-edit")
- (error "You do not seem to have Custom installed.
-Fetch it from <URL:http://www.dina.kvl.dk/~abraham/custom/>.
-You also then need to add the following to the lisp/dgnushack.el file:
-
- (push \"~/lisp/custom\" load-path)
-
-Modify to suit your needs."))
;; Show `load-path'.
(message "load-path=(\"%s\")"
(require 'gnus)
(byte-recompile-directory "." 0))
-(defvar dgnushack-gnus-load-file (expand-file-name "gnus-load.el" srcdir))
-(defvar dgnushack-cus-load-file (expand-file-name "cus-load.el" srcdir))
-(defvar dgnushack-auto-load-file (expand-file-name "auto-autoloads.el" srcdir))
+(defvar dgnushack-gnus-load-file
+ (if (featurep 'xemacs)
+ (expand-file-name "auto-autoloads.el" srcdir)
+ (expand-file-name "gnus-load.el" srcdir)))
+
+(defvar dgnushack-cus-load-file
+ (if (featurep 'xemacs)
+ (expand-file-name "custom-load.el" srcdir)
+ (expand-file-name "cus-load.el" srcdir)))
(defun dgnushack-make-cus-load ()
- (when (condition-case nil
- (load "cus-dep")
- (error nil))
- (let ((cusload-base-file dgnushack-cus-load-file))
- (if (fboundp 'custom-make-dependencies)
- (custom-make-dependencies)
- (Custom-make-dependencies)))))
+ (load "cus-dep")
+ (let ((cusload-base-file dgnushack-cus-load-file))
+ (if (fboundp 'custom-make-dependencies)
+ (custom-make-dependencies)
+ (Custom-make-dependencies))
+ (when (featurep 'xemacs)
+ (message "Compiling %s..." dgnushack-cus-load-file)
+ (byte-compile-file dgnushack-cus-load-file))))
(defun dgnushack-make-auto-load ()
(require 'autoload)
(make-backup-files nil)
(autoload-package-name "gnus"))
(if (featurep 'xemacs)
- (progn
- (if (file-exists-p generated-autoload-file)
- (delete-file generated-autoload-file))
- (if (file-exists-p dgnushack-auto-load-file)
- (delete-file dgnushack-auto-load-file)))
+ (if (file-exists-p generated-autoload-file)
+ (delete-file generated-autoload-file))
(with-temp-file generated-autoload-file
(insert ?\014)))
(if (featurep 'xemacs)
(batch-update-autoloads))))
(defun dgnushack-make-load ()
- (message (format "Generating %s..." dgnushack-gnus-load-file))
- (with-temp-file dgnushack-gnus-load-file
- (if (file-exists-p dgnushack-cus-load-file)
- (progn
- (insert-file-contents dgnushack-cus-load-file)
- (delete-file dgnushack-cus-load-file)
- (goto-char (point-min))
- (search-forward ";;; Code:")
- (forward-line)
- (delete-region (point-min) (point))
- (unless (re-search-forward "\
-^[\t ]*(autoload[\t\n ]+\\('\\|(quote[\t\n ]+\\)custom-add-loads[\t\n ]"
- nil t)
- (insert "\n(autoload 'custom-add-loads \"cus-load\")\n"))
- (goto-char (point-min))
- (insert "\
+ (unless (featurep 'xemacs)
+ (message "Generating %s..." dgnushack-gnus-load-file)
+ (with-temp-file dgnushack-gnus-load-file
+ (insert-file-contents dgnushack-cus-load-file)
+ (delete-file dgnushack-cus-load-file)
+ (goto-char (point-min))
+ (search-forward ";;; Code:")
+ (forward-line)
+ (delete-region (point-min) (point))
+ (insert "\
;;; gnus-load.el --- automatically extracted custom dependencies and autoload
;;
;;; Code:
")
- (goto-char (point-max))
- (if (search-backward "custom-versions-load-alist" nil t)
- (forward-line -1)
- (forward-line -1)
- (while (eq (char-after) ?\;)
- (forward-line -1))
- (forward-line))
- (delete-region (point) (point-max))
- (insert "\n"))
+ (goto-char (point-max))
+ (if (search-backward "custom-versions-load-alist" nil t)
+ (forward-line -1)
+ (forward-line -1)
+ (while (eq (char-after) ?\;)
+ (forward-line -1))
+ (forward-line))
+ (delete-region (point) (point-max))
+ (insert "\n")
+ ;; smiley-* are duplicated. Remove them all.
+ (let ((point (point)))
+ (insert-file-contents dgnushack-gnus-load-file)
+ (goto-char point)
+ (while (search-forward "smiley-" nil t)
+ (beginning-of-line)
+ (if (looking-at "(autoload ")
+ (delete-region (point) (progn (forward-sexp) (point)))
+ (forward-line))))
+ ;;
+ (goto-char (point-max))
+ (when (search-backward "\n(provide " nil t)
+ (forward-line -1)
+ (delete-region (point) (point-max)))
(insert "\
-;;; gnus-load.el --- automatically extracted autoload
-;;
-;;; Code:
-"))
- ;; smiley-* are duplicated. Remove them all.
- (let ((point (point)))
- (insert-file-contents dgnushack-gnus-load-file)
- (goto-char point)
- (while (search-forward "smiley-" nil t)
- (beginning-of-line)
- (if (looking-at "(autoload ")
- (delete-region (point) (progn (forward-sexp) (point)))
- (forward-line))))
- ;;
- (goto-char (point-max))
- (when (search-backward "\n(provide " nil t)
- (forward-line -1)
- (delete-region (point) (point-max)))
- (insert "\
\(provide 'gnus-load)
;;; End:
;;; gnus-load.el ends here
")
- ;; Workaround the bug in some version of XEmacs.
- (when (featurep 'xemacs)
- (condition-case nil
- (require 'cus-load)
- (error nil))
- (goto-char (point-min))
- (when (and (fboundp 'custom-add-loads)
- (not (search-forward "\n(autoload 'custom-add-loads " nil t)))
- (search-forward "\n;;; Code:" nil t)
- (forward-line 1)
- (insert "\n(autoload 'custom-add-loads \"cus-load\")\n"))))
- (message (format "Compiling %s..." dgnushack-gnus-load-file))
- (byte-compile-file dgnushack-gnus-load-file))
-
-\f
-(defun dgnushack-compose-package ()
- "Re-split the file gnus-load.el into custom-load.el and
-auto-autoloads.el. It is silly, should be improved!"
- (message "
-Re-splitting gnus-load.el into custom-load.el and auto-autoloads.el...")
- (let ((customload (expand-file-name "custom-load.el" srcdir))
- (autoloads (expand-file-name "auto-autoloads.el" srcdir))
- start)
- (with-temp-buffer
- (insert-file-contents dgnushack-gnus-load-file)
- (delete-file dgnushack-gnus-load-file)
- (when (file-exists-p (concat dgnushack-gnus-load-file "c"))
- (delete-file (concat dgnushack-gnus-load-file "c")))
- (while (prog1
- (looking-at "[\t ;]")
- (forward-line 1)))
- (setq start (point))
+ ))
+ (message "Compiling %s..." dgnushack-gnus-load-file)
+ (byte-compile-file dgnushack-gnus-load-file)
+ (when (featurep 'xemacs)
+ (message "Creating dummy gnus-load.el...")
+ (with-temp-file (expand-file-name "gnus-load.el")
(insert "\
-;;; custom-load.el --- automatically extracted custom dependencies\n
-;;; Code:\n\n")
- (goto-char (point-max))
- (while (progn
- (forward-line -1)
- (not (looking-at "[\t ]*(custom-add-loads[\t\n ]"))))
- (forward-list 1)
- (forward-line 1)
- (insert "\n;;; custom-load.el ends here\n")
- (write-region start (point) customload)
- (while (looking-at "[\t ]*$")
- (forward-line 1))
- (setq start (point))
- (if (re-search-forward "^[\t\n ]*(if[\t\n ]+(featurep[\t\n ]" nil t)
- (let ((from (goto-char (match-beginning 0))))
- (delete-region from (progn
- (forward-list 1)
- (forward-line 1)
- (point))))
- (while (looking-at "[\t ;]")
- (forward-line 1)))
- (insert "(if (featurep 'gnus-autoloads) (error \"Already loaded\"))\n")
- (goto-char (point-max))
- (while (progn
- (forward-line -1)
- (not (looking-at "[\t ]*(provide[\t\n ]"))))
- (insert "(provide 'gnus-autoloads)\n")
- (write-region start (point) autoloads))
- (byte-compile-file customload)
- (byte-compile-file autoloads))
- (message "\
-Re-splitting gnus-load.el into custom-load.el and auto-autoloads.el...done
-\n"))
+
+\(provide 'gnus-load)
+
+;;; Local Variables:
+;;; version-control: never
+;;; no-byte-compile: t
+;;; no-update-autoloads: t
+;;; End:
+;;; gnus-load.el ends here"))))
\f
(defconst dgnushack-info-file-regexp-en
t)
'string-lessp))
(while (setq file (pop files))
- (insert "info/" file "\n"))))))
-
-\f
-(define-compiler-macro describe-key-briefly (&whole form key &optional insert)
- (if (condition-case nil
- (progn
- (describe-key-briefly '((())) nil)
- t)
- (wrong-number-of-arguments nil);; Old Emacsen.
- (error t))
- form
- (if insert
- `(if ,insert
- (insert (funcall 'describe-key-briefly ,key))
- (funcall 'describe-key-briefly ,key))
- `(funcall 'describe-key-briefly ,key))))
+ (insert "info/" file "\n"))
+ (insert "etc/gnus-tut.txt\n")
+ (setq files
+ (sort (directory-files "../etc/images/gnus/" nil
+ "\\.\\(pbm\\|xbm\\|xpm\\)\\'"
+ t)
+ 'string-lessp))
+ (while (setq file (pop files))
+ (insert "etc/images/gnus/" file "\n"))
+ (insert "etc/images/gnus/x-splash\n")
+ (setq files
+ (sort (directory-files "../etc/images/smilies/" nil
+ "\\.\\(pbm\\|xpm\\)\\'"
+ t)
+ 'string-lessp))
+ (while (setq file (pop files))
+ (insert "etc/images/smilies/" file "\n"))))))
+
+(defun dgnushack-find-lisp-shadows (&optional lispdir)
+ "Return a list of directories in which other Gnus installations exist.
+This function looks for the other Gnus installations which will shadow
+the new Gnus Lisp modules which have been installed in LISPDIR, using
+the default `load-path'. The return value will make sense only when
+LISPDIR is existent and is listed in the default `load-path'. Assume
+LISPDIR will be prepended to `load-path' by a user if the default
+`load-path' does not contain it."
+ (unless lispdir
+ (setq lispdir (getenv "lispdir")))
+ (when (and lispdir (file-directory-p lispdir))
+ (setq lispdir (file-truename (directory-file-name lispdir)))
+ (let ((indices '("gnus.elc" "gnus.el" "gnus.el.bz2" "gnus.el.gz"
+ "message.elc" "message.el" "message.el.bz2"
+ "message.el.gz"))
+ (path (delq nil (mapcar
+ (lambda (p)
+ (condition-case nil
+ (when (and p (file-directory-p p))
+ (file-truename (directory-file-name p)))
+ (error nil)))
+ dgnushack-default-load-path)))
+ rest elcs)
+ (while path
+ (setq rest (cons (car path) rest)
+ path (delete (car rest) (cdr path))))
+ (setq path (nreverse (cdr (member lispdir rest)))
+ rest nil)
+ (while path
+ (setq elcs indices)
+ (while elcs
+ (when (file-exists-p (expand-file-name (pop elcs) (car path)))
+ (setq rest (cons (car path) rest)
+ elcs nil)))
+ (setq path (cdr path)))
+ (prog1
+ (setq path (nreverse rest))
+ (when path
+ (let (print-level print-length)
+ (princ (concat "\n\
+WARNING: The other gnus installation" (if (cdr path) "s have" " has") "\
+ been detected in:\n\n " (mapconcat 'identity path "\n ") "\n\n\
+You will need to modify the run-time `load-path', remove them manually,
+or remove them using `make remove-installed-shadows'.\n\n"))))))))
+
+(defun dgnushack-remove-lisp-shadows (&optional lispdir)
+ "Remove the other Gnus installations which shadow the recent one."
+ (let ((path (with-temp-buffer
+ (let ((standard-output (current-buffer)))
+ (dgnushack-find-lisp-shadows lispdir))))
+ elcs files shadows file)
+ (when path
+ (unless (setq elcs (directory-files srcdir nil "\\.elc\\'"))
+ (error "You should build .elc files first."))
+ (setq files
+ (apply
+ 'append
+ (mapcar
+ (lambda (el)
+ (list (concat el "c") el (concat el ".bz2") (concat el ".gz")))
+ (append
+ (list (file-name-nondirectory dgnushack-gnus-load-file)
+ (file-name-nondirectory dgnushack-cus-load-file))
+ (mapcar (lambda (elc) (substring elc 0 -1)) elcs)))))
+ (while path
+ (setq shadows files)
+ (while shadows
+ (setq file (expand-file-name (pop shadows) (car path)))
+ (when (file-exists-p file)
+ (princ (concat " Removing " file "..."))
+ (condition-case nil
+ (progn
+ (delete-file file)
+ (princ "done\n"))
+ (error (princ "failed\n")))))
+ (setq path (cdr path))))))
;;; dgnushack.el ends here
projects / elisp / gnus.git- / blobdiff