;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
(t (concat filename ".elc"))))
(require 'bytecomp)
+;; To avoid having defsubsts and inlines happen.
+;(if (featurep 'xemacs)
+; (require 'byte-optimize)
+; (require 'byte-opt))
+;(defun byte-optimize-inline-handler (form)
+; "byte-optimize-handler for the `inline' special-form."
+; (cons 'progn (cdr form)))
+;(defalias 'byte-compile-file-form-defsubst 'byte-compile-file-form-defun)
(when (boundp 'MULE)
(let (current-load-list)
(load (expand-file-name "gnus-clfns.el" srcdir) nil t t)
+(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))
+
(require 'custom)
;; Bind functions defined by `defun-maybe'.
(while (setq form (condition-case nil
(read buffer)
(error nil)))
- (while form
- (setq elem (pop form))
- (unless (memq (car-safe elem)
- '(\` backquote
- 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)))))))
+ (when (listp form)
+ (while form
+ (setq elem (pop form))
+ (unless (memq (car-safe elem)
+ '(\` backquote
+ 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)
(byte-compile 'dgnushack-bind-colon-keywords)
(dgnushack-bind-colon-keywords)))
-(if (boundp 'MULE)
- (progn
- (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)
+ (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
(car (cdr args))))))
(setq args (cdr (cdr args))))
newform)
- form))))
+ 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)
(progn (require 'shimbun) nil)
(error '("nnshimbun.el")))
(unless (or (condition-case code
- (require 'w3-forms)
+ (require 'w3-parse)
(error
- (message "No w3: %s %s retrying..." code
- (locate-library "w3-forms"))
+ (message "No w3: %s%s, retrying..."
+ (error-message-string code)
+ (if (setq code (locate-library "w3-parse"))
+ (concat " (" code ")")
+ ""))
nil))
;; Maybe mis-configured Makefile is used (e.g.
;; configured for FSFmacs but XEmacs is running).
(copy-sequence load-path))))
(if (let ((load-path lp))
(condition-case nil
- (require 'w3-forms)
+ (require 'w3-parse)
(error nil)))
;; If success, fix `load-path' for compiling.
(progn
(setq load-path lp)
(message " => fixed; W3DIR=%s"
(file-name-directory
- (locate-library "w3-forms")))
+ (locate-library "w3-parse")))
t)
(message " => ignored")
nil)))
- '("nnweb.el" "nnlistserv.el" "nnultimate.el"
- "nnslashdot.el" "nnwarchive.el" "webmail.el"
- "nnwfm.el" "nnrss.el"))
+ '("nnultimate.el" "webmail.el" "nnwfm.el"))
(condition-case code
(progn (require 'mh-e) nil)
(error
- (message "No mh-e: %s %s (ignored)" code (locate-library "mh-e"))
+ (message "No mh-e: %s%s (ignored)"
+ (error-message-string code)
+ (if (setq code (locate-library "mh-e"))
+ (concat " (" code ")")
+ ""))
'("gnus-mh.el")))
(condition-case code
(progn (require 'xml) nil)
(error
- (message "No xml: %s %s (ignored)" code (locate-library "xml"))
+ (message "No xml: %s%s (ignored)"
+ (error-message-string code)
+ (if (setq code (locate-library "xml"))
+ (concat " (" code ")")
+ ""))
'("nnrss.el")))
(condition-case code
(progn (require 'bbdb) nil)
(error
- (message "No bbdb: %s %s (ignored)" code (locate-library "bbdb"))
+ (message "No bbdb: %s%s (ignored)"
+ (error-message-string code)
+ (if (setq code (locate-library "bbdb"))
+ (concat " (" code ")")
+ ""))
'("gnus-bbdb.el")))
(unless (featurep 'xemacs)
- '("gnus-xmas.el" "gnus-picon.el" "messagexmas.el"
- "nnheaderxm.el" "smiley.el"))
- (when (or (featurep 'xemacs) (<= emacs-major-version 20))
- '("smiley-ems.el"))
+ '("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")))
+ '("md5.el"))
+ (unless (boundp 'MULE)
+ '("canlock-om.el")))
"Files which will not be installed.")
(defconst dgnushack-exporting-files