;;; 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, 2003,
+;; 2004, 2005, 2006, 2007, 2008
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; 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:
;;; Code:
+(defvar dgnushack-default-load-path (copy-sequence load-path))
+
(defalias '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 "lispdir")))
+ (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/" srcdir))
+(push (or (my-getenv "URLDIR") (expand-file-name "../../url/lisp/" loaddir))
load-path)
-(push (or (my-getenv "W3DIR") (expand-file-name "../../w3/lisp/" srcdir))
+(push (or (my-getenv "W3DIR") (expand-file-name "../../w3/lisp/" loaddir))
load-path)
-(push "/usr/share/emacs/site-lisp" load-path)
-
-(unless (featurep 'xemacs)
- (define-compiler-macro last (&whole form x &optional n)
- (if (and (fboundp 'last)
- (subrp (symbol-function 'last)))
- form
- (if n
- `(let* ((x ,x)
- (n ,n)
- (m 0)
- (p x))
- (while (consp p)
- (incf m)
- (pop p))
- (if (<= n 0)
- p
- (if (< n m)
- (nthcdr (- m n) x)
- x)))
- `(let ((x ,x))
- (while (consp (cdr x))
- (pop x))
- x))))
- )
+;(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
(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)
+ (message "This should not appear in the byte-code."))
+ 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 22."
+ (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.
+;;
+;; Should be fixed in XEmacs (March 2007).
+;; http://thread.gmane.org/gmane.emacs.xemacs.patches/8124
+;; When should we remove this workaround?
+;;
+(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)
-(load (expand-file-name "lpath.el" srcdir) nil t)
+(push loaddir load-path)
+(load (expand-file-name "lpath.el" loaddir) nil t)
(defalias 'device-sound-enabled-p 'ignore)
(defalias 'play-sound-file '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-index "info" nil t)
+ (autoload 'Info-index-next "info" nil t)
+ (autoload 'Info-menu "info" nil t)
+ (autoload 'ad-add-advice "advice")
+ (unless (and (emacs-version>= 21 5)
+ (not (featurep 'sxemacs)))
+ ;; calendar/auto-autoloads.el provides it.
+ (autoload 'add-to-invisibility-spec "dummy"))
+ (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 'browse-url-of-file "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 'debug "debug" nil t)
+ (if (featurep 'mule)
+ (unless (locate-library "mule-ccl")
+ (autoload 'define-ccl-program "ccl" nil nil 'macro))
+ (defalias 'define-ccl-program 'ignore))
+ (autoload 'delete-annotation "annotations")
+ (autoload 'dolist "cl-macs" nil nil 'macro)
+ (autoload 'enriched-decode "enriched")
+ (autoload 'eudc-expand-inline "eudc" nil t)
+ (autoload 'executable-find "executable")
+ (autoload 'font-lock-fontify-buffer "font-lock" nil t)
+ (when (and (emacs-version>= 21 5)
+ (not (featurep 'sxemacs)))
+ (autoload 'get-display-table "disp-table")
+ (autoload 'put-display-table "disp-table"))
+ (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 'pgg-snarf-keys-region "pgg" nil t)
+ (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 'thing-at-point "thingatpt")
+ (autoload 'toggle-truncate-lines "view-less" nil t)
+ (autoload 'trace-function-background "trace" nil t)
+ (autoload 'unmorse-region "morse" 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-emacs-compile-defcustom-p ()
+ "Return non-nil if Emacs byte compiles `defcustom' forms.
+Those Emacsen will warn against undefined variables and functions used
+in `defcustom' forms."
+ (let ((outbuf (with-temp-buffer
+ (insert "(defcustom foo (1+ (random)) \"\" :group 'emacs)\n")
+ (byte-compile-from-buffer (current-buffer) "foo.el"))))
+ (when outbuf
+ (prog1
+ (with-current-buffer outbuf
+ (goto-char (point-min))
+ (search-forward " 'foo '(byte-code " nil t))
+ (kill-buffer outbuf)))))
+
+(when (dgnushack-emacs-compile-defcustom-p)
+ (maybe-fbind '(defined-colors face-attribute))
+ (maybe-bind '(idna-program installation-directory)))
+
+(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."))
(let ((files (directory-files srcdir nil "^[^=].*\\.el$"))
;;(byte-compile-generate-call-tree t)
file elc)
(when (featurep 'base64)
(setq files (delete "base64.el" files)))
(condition-case code
- (require 'w3-forms)
+ (require 'w3-parse)
(error
- (message "No w3: %s %s" code (locate-library "w3-forms"))
- (dolist (file '("nnweb.el" "nnlistserv.el" "nnultimate.el"
- "nnslashdot.el" "nnwarchive.el" "webmail.el"
- "nnwfm.el"))
+ (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" "smiley-ems.el")
- '("gnus-xmas.el" "gnus-picon.el" "messagexmas.el"
- "nnheaderxm.el" "smiley.el")))
+ '("md5.el")
+ '("gnus-xmas.el" "messagexmas.el" "nnheaderxm.el")))
(setq files (delete file files)))
(dolist (file files)
(require 'gnus)
(byte-recompile-directory "." 0))
-(defvar dgnushack-gnus-load-file (expand-file-name "gnus-load.el"))
-(defvar dgnushack-cus-load-file (expand-file-name "cus-load.el"))
+(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))))
+ (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 (featurep 'xemacs)
(if (file-exists-p generated-autoload-file)
(delete-file generated-autoload-file))
(with-temp-file generated-autoload-file
(batch-update-autoloads)))
(defun dgnushack-make-load ()
- (message (format "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 "\
+ (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)
+ (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)
- (forward-line -1)
- (while (eq (char-after) ?\;)
- (forward-line -1))
- (forward-line))
- (delete-region (point) (point-max))
- (insert "\n")
- (insert-file-contents dgnushack-gnus-load-file)
- (goto-char (point-max))
- (when (search-backward "\n(provide " nil t)
- (forward-line -1)
- (delete-region (point) (point-max)))
- (insert "\
+ (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)
;;; no-byte-compile: t
;;; no-update-autoloads: t
;;; End:
-;;; gnus-load.el ends here\n"))
- (message (format "Compiling %s..." dgnushack-gnus-load-file))
- (byte-compile-file dgnushack-gnus-load-file))
+;;; 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
projects / gnus / blobdiff