X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=0f4041f2a97140c5c520dd36420821e3ffa90788;hb=a8ee92ba66284aa600ccd866e9a85fcbe35ea116;hp=796707e690249442fbcdb015358cd3443471cc26;hpb=96c961b9ac6093c460920efc5dbbaec2b27cd496;p=gnus

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 796707e69..0f4041f2a 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,5 +1,5 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -33,38 +33,65 @@
 
 (defvar srcdir (or (getenv "srcdir") "."))
 
-(push (or (getenv "lispdir")
-	  "/usr/share/emacs/site-lisp")
+(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/" srcdir))
       load-path)
 
-(push (or (getenv "W3DIR") (expand-file-name "../../w3/lisp/" srcdir))
+(push (or (my-getenv "W3DIR") (expand-file-name "../../w3/lisp/" srcdir))
       load-path)
 
-(push "/usr/share/emacs/site-lisp" 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)))
+  (define-compiler-macro merge (&whole form type seq1 seq2 pred &rest keys)
+    (if (and (fboundp 'merge)
+	     (subrp (symbol-function 'merge)))
 	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))))
-  )
+      `(let ((type ,type)
+	     (seq1 ,seq1)
+	     (seq2 ,seq2)
+	     (pred ,pred))
+	 (or (listp seq1) (setq seq1 (append seq1 nil)))
+	 (or (listp seq2) (setq seq2 (append seq2 nil)))
+	 (let ((res nil))
+	   (while (and seq1 seq2)
+	     (if (funcall pred (car seq2) (car seq1))
+		 (push (pop seq2) res)
+	       (push (pop seq1) res)))
+	   (let ((x (nconc (nreverse res) seq1 seq2)))
+	     (cond ((eq type 'list) (if (listp x) x (append x nil)))
+		   ((eq type 'vector) (if (vectorp x) x (vconcat x)))
+		   ((eq type 'string) (if (stringp x) x (concat x)))
+		   ((eq type 'array) (if (arrayp x) x (vconcat x)))
+		   ((and (eq type 'character) (stringp x) (= (length x) 1))
+		    (aref x 0))
+		   ((and (eq type 'character) (symbolp x)) 
+		    (aref (symbol-name x) 0))
+		   ((eq type 'float) (float x))
+		   ((typep x type) x)
+		   (t (error "Can't coerce %s to type %s" x type))))))))
+
+  (define-compiler-macro copy-list (&whole form list)
+    (if (and (fboundp 'copy-list)
+	     (subrp (symbol-function 'copy-list)))
+	form
+      `(let ((list ,list))
+	 (if (consp list)
+	     (let ((res nil))
+	       (while (consp list) (push (pop list) res))
+	       (prog1 (nreverse res) (setcdr res list)))
+	   (car list)))))
+
+  (define-compiler-macro remove (&whole form item seq)
+    (if (>= emacs-major-version 21)
+	form
+      `(delete ,item (copy-sequence ,seq)))))
 
 ;; If we are building w3 in a different directory than the source
 ;; directory, we must read *.el from source directory and write *.elc
@@ -85,6 +112,14 @@
 	(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)
 
 (push srcdir load-path)
 (load (expand-file-name "lpath.el" srcdir) nil t)
@@ -128,18 +163,25 @@ Modify to suit your needs."))
     (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)
@@ -161,4 +203,102 @@ Modify to suit your needs."))
   (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"))
+
+(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))))
+
+(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 ()
+  (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 "\
+;;; 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
+")
+    ;; 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))
+
 ;;; dgnushack.el ends here