;;; 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
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1994,95,96,97,98 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Version: 4.19
;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Commentary:
;;; Code:
-(defvar dgnushack-default-load-path (copy-sequence load-path))
-
-(defalias 'facep 'ignore)
+(fset 'facep 'ignore)
(require 'cl)
-
-(defvar srcdir (or (getenv "srcdir") "."))
-(defvar loaddir (and load-file-name (file-name-directory load-file-name)))
-
-(defun my-getenv (str)
- (let ((val (getenv str)))
- (if (equal val "no") nil val)))
-
-(if (my-getenv "lispdir")
- (push (my-getenv "lispdir") load-path))
-
-(push (or (my-getenv "URLDIR") (expand-file-name "../../url/lisp/" loaddir))
- load-path)
-
-(push (or (my-getenv "W3DIR") (expand-file-name "../../w3/lisp/" loaddir))
- load-path)
-
-;(push "/usr/share/emacs/site-lisp" load-path)
-
-;; If we are building w3 in a different directory than the source
-;; directory, we must read *.el from source directory and write *.elc
-;; into the building directory. For that, we define this function
-;; before loading bytecomp. Bytecomp doesn't overwrite this function.
-(defun byte-compile-dest-file (filename)
- "Convert an Emacs Lisp source file name to a compiled file name.
- In addition, remove directory name part from FILENAME."
- (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))
- (setq filename (downcase filename)))
- (cond ((eq system-type 'vax-vms)
- (concat (substring filename 0 (string-match ";" filename)) "c"))
- ((string-match emacs-lisp-file-regexp filename)
- (concat (substring filename 0 (match-beginning 0)) ".elc"))
- (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 (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)
- "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))))
- (while (and backwards
- (null (setcar backwards
- (byte-optimize-form (car backwards) t))))
- (setq backwards (cdr backwards)))
- (if (and (cdr form) (null backwards))
- (byte-compile-log
- " all subforms of %s called for effect; deleted" form))
- (when backwards
- (setcdr backwards
- (mapcar 'byte-optimize-form (cdr backwards))))
- (setq ad-return-value (cons fn (nreverse backwards))))
- ad-do-it)))
-
-;; Work around for an incompatibility (XEmacs 21.4 vs. 21.5), see the
-;; following threads:
-;;
-;; http://thread.gmane.org/gmane.emacs.gnus.general/56414
-;; Subject: attachment problems found but not fixed
-;;
-;; http://thread.gmane.org/gmane.emacs.gnus.general/56459
-;; Subject: Splitting mail -- XEmacs 21.4 vs 21.5
-;;
-;; http://thread.gmane.org/gmane.emacs.xemacs.beta/20519
-;; Subject: XEmacs 21.5 and Gnus fancy splitting.
-(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)))))
-
-(push srcdir load-path)
-(push loaddir load-path)
-(load (expand-file-name "lpath.el" loaddir) nil t)
+(push "~/lisp/custom" load-path)
+(push "." load-path)
+(load "./lpath.el" nil t)
(defalias 'device-sound-enabled-p 'ignore)
(defalias 'play-sound-file 'ignore)
(defalias 'define-mail-user-agent 'ignore)
(eval-and-compile
- (unless (featurep 'xemacs)
- (defalias 'get-popup-menu-response 'ignore)
- (defalias 'event-object 'ignore)
- (defalias 'x-defined-colors 'ignore)
- (defalias 'read-color 'ignore)))
-
-(eval-and-compile
- (when (featurep 'xemacs)
- (unless (fboundp 'defadvice)
- (autoload 'defadvice "advice" nil nil 'macro))
- (autoload 'Info-directory "info" nil t)
- (autoload 'Info-menu "info" nil t)
- (autoload 'annotations-at "annotations")
- (autoload 'apropos "apropos" 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-group "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 'ps-despool "ps-print" nil t)
- (autoload 'ps-spool-buffer "ps-print" nil t)
- (autoload 'ps-spool-buffer-with-faces "ps-print" nil t)
- (autoload 'read-passwd "passwd")
- (autoload 'regexp-opt "regexp-opt")
- (autoload 'reporter-submit-bug-report "reporter")
- (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 'smtpmail-send-it "smtpmail")
- (autoload 'sort-numeric-fields "sort" nil t)
- (autoload 'sort-subr "sort")
- (autoload 'trace-function-background "trace" nil t)
- (autoload 'w3-do-setup "w3")
- (autoload 'w3-prepare-buffer "w3-display")
- (autoload 'w3-region "w3-display" nil t)
- (defalias 'frame-char-height 'frame-height)
- (defalias 'frame-char-width 'frame-width)
- (defalias 'frame-parameter 'frame-property)
- (defalias 'make-overlay 'ignore)
- (defalias 'overlay-end 'ignore)
- (defalias 'overlay-get 'ignore)
- (defalias 'overlay-put 'ignore)
- (defalias 'overlay-start 'ignore)
- (defalias 'overlays-in 'ignore)
- (defalias 'replace-dehighlight 'ignore)
- (defalias 'replace-highlight 'ignore)
- (defalias 'w3-coding-system-for-mime-charset 'ignore)))
-
-(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))
+ (unless (string-match "XEmacs" emacs-version)
+ (fset 'get-popup-menu-response 'ignore)
+ (fset 'event-object 'ignore)
+ (fset 'x-defined-colors 'ignore)
+ (fset 'read-color 'ignore)))
(defun dgnushack-compile (&optional warn)
;;(setq byte-compile-dynamic t)
(unless warn
(setq byte-compile-warnings
'(free-vars unresolved callargs redefine)))
- (let ((files (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
- ;; installed.
- (when (featurep 'xemacs)
- (setq gnus-xmas-glyph-directory "dummy"))
- (dolist (file '("dgnushack.el" "lpath.el"))
- (setq files (delete file files)))
- (when (featurep 'base64)
- (setq files (delete "base64.el" files)))
- (condition-case code
- (require 'w3-parse)
- (error
- (message "No w3: %s %s" (cadr code) (or (locate-library "w3-parse") ""))
- (dolist (file '("nnultimate.el" "webmail.el" "nnwfm.el"))
- (setq files (delete file files)))))
- (condition-case code
- (require 'mh-e)
- (error
- (message "No mh-e: %s %s" (cadr code) (or (locate-library "mh-e") ""))
- (setq files (delete "gnus-mh.el" files))))
- (condition-case code
- (require 'xml)
- (error
- (message "No xml: %s %s" (cadr code) (or (locate-library "xml") ""))
- (setq files (delete "nnrss.el" files))))
- (dolist (file
- (if (featurep 'xemacs)
- '("md5.el")
- '("gnus-xmas.el" "messagexmas.el" "nnheaderxm.el")))
- (setq files (delete file files)))
+ (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:
- (dolist (file files)
- (setq file (expand-file-name file srcdir))
- (when (and (file-exists-p
- (setq elc (concat (file-name-nondirectory file) "c")))
- (file-newer-than-file-p file elc))
- (delete-file elc)))
+ (push \"~/lisp/custom\" load-path)
+Modify to suit your needs."))
+ (let ((files (directory-files "." nil "^[^=].*\\.el$"))
+ (xemacs (string-match "XEmacs" emacs-version))
+ ;;(byte-compile-generate-call-tree t)
+ file elc)
+ (condition-case ()
+ (require 'w3-forms)
+ (error (setq files (delete "nnweb.el" (delete "nnlistserv.el" files)))))
+ (condition-case ()
+ (require 'bbdb)
+ (error (setq files (delete "gnus-bbdb.el" files))))
(while (setq file (pop files))
- (setq file (expand-file-name file srcdir))
- (when (or (not (file-exists-p
- (setq elc (concat (file-name-nondirectory file) "c"))))
- (file-newer-than-file-p file elc))
- (ignore-errors
- (byte-compile-file file))))))
+ (when (or (and (not xemacs)
+ (not (member file '("gnus-xmas.el" "gnus-picon.el"
+ "messagexmas.el" "nnheaderxm.el"
+ "smiley.el" "x-overlay.el"))))
+ (and xemacs
+ (not (member file '("md5.el")))))
+ (when (or (not (file-exists-p (setq elc (concat file "c"))))
+ (file-newer-than-file-p file elc))
+ (ignore-errors
+ (byte-compile-file file)))))))
(defun dgnushack-recompile ()
(require 'gnus)
(byte-recompile-directory "." 0))
-(defvar dgnushack-gnus-load-file
- (if (featurep 'xemacs)
- (expand-file-name "auto-autoloads.el")
- (expand-file-name "gnus-load.el")))
-
-(defvar dgnushack-cus-load-file
- (if (featurep 'xemacs)
- (expand-file-name "custom-load.el")
- (expand-file-name "cus-load.el")))
-
-(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))
- (when (featurep 'xemacs)
- (message "Compiling %s..." dgnushack-cus-load-file)
- (byte-compile-file dgnushack-cus-load-file))))
-
-(defun dgnushack-make-auto-load ()
- (require 'autoload)
- (unless (make-autoload '(define-derived-mode child parent name
- "docstring" body)
- "file")
- (defadvice make-autoload (around handle-define-derived-mode activate)
- "Handle `define-derived-mode'."
- (if (eq (car-safe (ad-get-arg 0)) 'define-derived-mode)
- (setq ad-return-value
- (list 'autoload
- (list 'quote (nth 1 (ad-get-arg 0)))
- (ad-get-arg 1)
- (nth 4 (ad-get-arg 0))
- t nil))
- ad-do-it))
- (put 'define-derived-mode 'doc-string-elt 3))
- (let ((generated-autoload-file dgnushack-gnus-load-file)
- (make-backup-files nil)
- (autoload-package-name "gnus"))
- (if (featurep 'xemacs)
- (if (file-exists-p generated-autoload-file)
- (delete-file generated-autoload-file))
- (with-temp-file generated-autoload-file
- (insert ?\014)))
- (batch-update-autoloads)))
-
-(defun dgnushack-make-load ()
- (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")
- ;; 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)
-
-;;; Local Variables:
-;;; version-control: never
-;;; no-byte-compile: t
-;;; no-update-autoloads: t
-;;; End:
-;;; gnus-load.el ends here
-")
- ))
- (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 "\
-
-\(provide 'gnus-load)
-
-;;; Local Variables:
-;;; version-control: never
-;;; no-byte-compile: t
-;;; no-update-autoloads: t
-;;; End:
-;;; gnus-load.el ends here"))))
-
-(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
-;;; arch-tag: 579f585a-24eb-4e1c-8d34-4808e11b68f2