(defvar srcdir (or (getenv "srcdir") "."))
(defun my-getenv (str)
- (let ((val (getenv "lispdir")))
+ (let ((val (getenv str)))
(if (equal val "no") nil val)))
(if (my-getenv "lispdir")
(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)
(while (consp (cdr x))
(pop x))
x))))
+
+ (define-compiler-macro coerce (&whole form x type)
+ (if (and (fboundp 'coerce)
+ (subrp (symbol-function 'coerce)))
+ form
+ `(let ((x ,x)
+ (type ,type))
+ (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)
+ (= (length (symbol-name x)) 1))
+ (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 merge (&whole form type seq1 seq2 pred &rest keys)
+ (if (and (fboundp 'merge)
+ (subrp (symbol-function 'merge)))
+ form
+ `(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)))
+ (coerce (nconc (nreverse res) seq1 seq2) type)))))
+
+ (define-compiler-macro subseq (&whole form seq start &optional end)
+ (if (and (fboundp 'subseq)
+ (subrp (symbol-function 'subseq)))
+ form
+ (if end
+ `(let ((seq ,seq)
+ (start ,start)
+ (end ,end))
+ (if (stringp seq)
+ (substring seq start end)
+ (let (len)
+ (if (< end 0)
+ (setq end (+ end (setq len (length seq)))))
+ (if (< start 0)
+ (setq start (+ start (or len (setq len (length seq))))))
+ (cond ((listp seq)
+ (if (> start 0)
+ (setq seq (nthcdr start seq)))
+ (let ((res nil))
+ (while (>= (setq end (1- end)) start)
+ (push (pop seq) res))
+ (nreverse res)))
+ (t
+ (let ((res (make-vector (max (- end start) 0) nil))
+ (i 0))
+ (while (< start end)
+ (aset res i (aref seq start))
+ (setq i (1+ i)
+ start (1+ start)))
+ res))))))
+ `(let ((seq ,seq)
+ (start ,start))
+ (if (stringp seq)
+ (substring seq start)
+ (let (len)
+ (if (< start 0)
+ (setq start (+ start (or len (setq len (length seq))))))
+ (cond ((listp seq)
+ (if (> start 0)
+ (setq seq (nthcdr start seq)))
+ (copy-sequence seq))
+ (t
+ (let* ((end (or len (length seq)))
+ (res (make-vector (max (- end start) 0) nil))
+ (i 0))
+ (while (< start end)
+ (aset res i (aref seq start))
+ (setq i (1+ i)
+ start (1+ start)))
+ res)))))))))
+
+ (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)))))
)
;; If we are building w3 in a different directory than the source
(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" code (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" code (locate-library "mh-e"))
+ (setq files (delete "gnus-mh.el" files))))
+ (condition-case code
+ (require 'xml)
+ (error
+ (message "No xml: %s %s" code (locate-library "xml"))
+ (setq files (delete "nnrss.el" files))))
(dolist (file
(if (featurep 'xemacs)
'("md5.el" "smiley-ems.el")
(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
(forward-line))
(delete-region (point) (point-max))
(insert "\n")
- (insert-file-contents dgnushack-gnus-load-file)
+ ;; 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)
;;; no-byte-compile: t
;;; no-update-autoloads: t
;;; End:
-;;; gnus-load.el ends here\n"))
+;;; 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))
projects / gnus / blobdiff