;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994,95,96,97,98,99 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000
+;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Katsumi Yamaoka <yamaoka@jpl.org>
;;; Code:
;; Set coding priority of Shift-JIS to the bottom.
-(defvar *predefined-category*)
-(defvar coding-category-list)
(if (featurep 'xemacs)
- (fset 'set-coding-priority 'ignore)
- (fset 'coding-priority-list 'ignore)
- (fset 'set-coding-priority-list 'ignore))
+ (defalias 'set-coding-priority 'ignore)
+ (defalias 'coding-priority-list 'ignore)
+ (defalias 'set-coding-priority-list 'ignore))
(cond ((and (featurep 'xemacs) (featurep 'mule))
(if (memq 'shift-jis (coding-priority-list))
(set-coding-priority-list
- (nconc (delq 'shift-jis (coding-priority-list)) '(shift-jis)))))
+ (append (delq 'shift-jis (coding-priority-list)) '(shift-jis)))))
((boundp 'MULE)
(put '*coding-category-sjis* 'priority (length *predefined-category*)))
((featurep 'mule)
(if (memq 'coding-category-sjis coding-category-list)
(set-coding-priority
- (nconc (delq 'coding-category-sjis coding-category-list)
- '(coding-category-sjis))))))
+ (append (delq 'coding-category-sjis
+ (copy-sequence coding-category-list))
+ '(coding-category-sjis))))))
-(fset 'facep 'ignore)
+(defalias 'facep 'ignore)
(require 'cl)
-;; Emulating cl functions.
-(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))))
-
- (define-compiler-macro mapc (&whole form fn seq &rest rest)
- (if (and (fboundp 'mapc)
- (subrp (symbol-function 'mapc)))
- form
- (if rest
- `(let* ((fn ,fn)
- (seq ,seq)
- (args (list seq ,@rest))
- (m (apply (function min) (mapcar (function length) args)))
- (n 0))
- (while (< n m)
- (apply fn (mapcar (function (lambda (arg) (nth n arg))) args))
- (setq n (1+ n)))
- seq)
- `(let ((seq ,seq))
- (mapcar ,fn seq)
- seq))))
-
- (define-compiler-macro mapcon (&whole form fn seq &rest rest)
- (if (and (fboundp 'mapcon)
- (subrp (symbol-function 'mapcon)))
- form
- (if rest
- `(let ((fn ,fn)
- res
- (args (list ,seq ,@rest))
- p)
- (while (not (memq nil args))
- (push (apply ,fn args) res)
- (setq p args)
- (while p
- (setcar p (cdr (pop p)))
- ))
- (apply (function nconc) (nreverse res)))
- `(let ((fn ,fn)
- res
- (arg ,seq))
- (while arg
- (push (funcall ,fn arg) res)
- (setq arg (cdr arg)))
- (apply (function nconc) (nreverse res))))))
-
- (define-compiler-macro member-if (&whole form pred list)
- (if (and (fboundp 'member-if)
- (subrp (symbol-function 'member-if)))
- form
- `(let ((fn ,pred)
- (seq ,list))
- (while (and seq
- (not (funcall fn (car seq))))
- (pop seq))
- seq)))
-
- (define-compiler-macro union (&whole form list1 list2)
- (if (and (fboundp 'union)
- (subrp (symbol-function 'union)))
- form
- `(let ((a ,list1)
- (b ,list2))
- (cond ((null a) b)
- ((null b) a)
- ((equal a b) a)
- (t
- (or (>= (length a) (length b))
- (setq a (prog1 b (setq b a))))
- (while b
- (or (memq (car b) a)
- (push (car b) a))
- (pop b))
- a)))))
- )
+(defvar srcdir (or (getenv "srcdir") "."))
+
+(push (or (getenv "W3DIR") (expand-file-name "../../w3/lisp/" srcdir))
+ load-path)
+(load (expand-file-name "dgnuspath.el" srcdir) nil nil t)
;; If we are building w3 in a different directory than the source
;; directory, we must read *.el from source directory and write *.elc
(unless (fboundp 'si:byte-optimize-form-code-walker)
(byte-optimize-form nil);; Load `byte-opt' or `byte-optimize'.
(setq max-specpdl-size 3000)
- (fset 'si:byte-optimize-form-code-walker
- (symbol-function 'byte-optimize-form-code-walker))
+ (defalias 'si:byte-optimize-form-code-walker
+ (symbol-function 'byte-optimize-form-code-walker))
(defun byte-optimize-form-code-walker (form for-effect)
(if (and for-effect (memq (car-safe form) '(and or)))
;; Fix bug in and/or forms.
(si:byte-optimize-form-code-walker form for-effect)))
(byte-compile 'byte-optimize-form-code-walker))
-(defvar srcdir (or (getenv "srcdir") "."))
-
-;(push "/usr/share/emacs/site-lisp" load-path)
+(load (expand-file-name "gnus-clfns.el" srcdir) nil t t)
-;; Attempt to pickup the additional load-path(s).
-(load (expand-file-name "dgnuspath.el" srcdir) nil nil t)
(condition-case err
(load "~/.lpath.el" t nil t)
(error (message "Error in \"~/.lpath.el\" file: %s" err)))
(defun byte-optimize-char-after (form)
(if (null (cdr form))
'(char-after (point))
- form))
- ))
+ form))))
(condition-case nil
(char-before)
(wrong-number-of-arguments
- (define-compiler-macro char-before (&whole form &optional pos)
- (if (null pos)
+ ;; Optimize byte code for `char-before'.
+ (put 'char-before 'byte-optimizer 'byte-optimize-char-before)
+ (defun byte-optimize-char-before (form)
+ (if (null (cdr form))
'(char-before (point))
form))))
+(push srcdir load-path)
+
;; `char-after' and `char-before' must be well-behaved before lpath.el
;; is loaded. Because it requires `poe' via `path-util'.
(load (expand-file-name "lpath.el" srcdir) nil t t)
:symbol-for-testing-whether-colon-keyword-is-available-or-not
(void-variable
;; Bind keywords.
- (mapcar (lambda (keyword) (set keyword keyword))
- '(:button-keymap :data :file :mime-handle))))
+ (dolist (keyword '(:button-keymap :data :file :mime-handle))
+ (set keyword keyword))))
;; Unknown variables and functions.
(unless (boundp 'buffer-file-coding-system)
(defalias 'ange-ftp-re-read-dir 'ignore)
(defalias 'define-mail-user-agent 'ignore)
+(defconst dgnushack-tool-files
+ '("dgnushack.el" "dgnuspath.el" "lpath.el" "ptexinfmt.el"))
+(defconst dgnushack-unexported-files
+ '("dgnuspath.el" "ptexinfmt.el"))
+
(defun dgnushack-compile (&optional warn)
;;(setq byte-compile-dynamic t)
(unless warn
(push \"~/lisp/custom\" load-path)
Modify to suit your needs."))
- (let ((files (delete "dgnuspath.el"
- (directory-files srcdir nil "^[^=].*\\.el$")))
- (xemacs (string-match "XEmacs" emacs-version))
- ;;(byte-compile-generate-call-tree t)
- file elc)
- (condition-case ()
- (require 'w3-forms)
- (error
- (dolist (file '("nnweb.el" "nnlistserv.el" "nnultimate.el"
- "nnslashdot.el" "nnwarchive.el" "webmail.el"))
- (setq files (delete file files)))))
- (condition-case ()
- (require 'bbdb)
- (error (setq files (delete "gnus-bbdb.el" files))))
- (while (setq file (pop files))
- (unless (or (and (not xemacs)
- (member file
- '("gnus-xmas.el" "gnus-picon.el"
- "messagexmas.el" "nnheaderxm.el"
- "smiley.el" "x-overlay.el")))
- (and (string-equal file "md5.el")
- (not (and (fboundp 'md5)
- (subrp (symbol-function 'md5))))))
+ (let ((files (directory-files srcdir nil "^[^=].*\\.el$")))
+ (dolist (file
+ (append
+ dgnushack-tool-files
+ (condition-case nil
+ (progn (require 'w3-forms) nil)
+ (error '("nnweb.el" "nnlistserv.el" "nnultimate.el"
+ "nnslashdot.el" "nnwarchive.el" "webmail.el")))
+ (condition-case nil
+ (progn (require 'bbdb) nil)
+ (error '("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"))
+ (when (and (fboundp 'md5) (subrp (symbol-function 'md5)))
+ '("md5.el"))))
+ (setq files (delete file files)))
+
+ (dolist (file files)
+ (setq file (expand-file-name file srcdir))
+ (when (and (file-exists-p (setq elc (concat file "c")))
+ (file-newer-than-file-p file elc))
+ (delete-file elc)))
+
+ (let (;;(byte-compile-generate-call-tree t)
+ file elc)
+ (while (setq file (pop files))
(setq file (expand-file-name file srcdir))
(when (or (not (file-exists-p (setq elc (concat file "c"))))
(file-newer-than-file-p file elc))
(byte-recompile-directory "." 0))
\f
-;; Avoid byte-compile warnings.
-(defvar gnus-product-name)
-(defvar early-package-load-path)
-(defvar early-packages)
-(defvar last-package-load-path)
-(defvar last-packages)
-(defvar late-package-load-path)
-(defvar late-packages)
-
(defconst dgnushack-info-file-regexp
(concat "^\\(gnus\\|message\\|emacs-mime\\|gnus-ja\\|message-ja\\)"
"\\.info\\(-[0-9]+\\)?$"))
"^\\(gnus\\|message\\|emacs-mime\\|gnus-ja\\|message-ja\\)\\.texi$")
(defun dgnushack-make-package ()
- (require 'gnus)
- (let* ((product-name (downcase gnus-product-name))
- (lisp-dir (concat "lisp/" product-name "/"))
- make-backup-files)
-
+ (let (make-backup-files)
(message "Updating autoloads for directory %s..." default-directory)
(let ((generated-autoload-file "auto-autoloads.el")
noninteractive
(with-temp-buffer
(let ((standard-output (current-buffer)))
(Custom-make-dependencies "."))
- (message (buffer-string)))
+ (message "%s" (buffer-string)))
(require 'cus-load)
(byte-compile-file "custom-load.el")
- (message "Generating MANIFEST.%s for the package..." product-name)
- (with-temp-buffer
- (insert "pkginfo/MANIFEST." product-name "\n"
- lisp-dir
- (mapconcat
- 'identity
- (sort (delete "dgnuspath.el"
- (delete "patchs.elc"
- (directory-files "." nil "\\.elc?$")))
- 'string-lessp)
- (concat "\n" lisp-dir))
- "\ninfo/"
- (mapconcat
- 'identity
- (sort (directory-files "../texi/"
- nil dgnushack-info-file-regexp)
- 'string-lessp)
- "\ninfo/")
- "\n")
- (write-file (concat "../MANIFEST." product-name)))))
+ (require 'gnus)
+ (let ((product-name (downcase gnus-product-name)))
+ (message "Generating MANIFEST.%s for the package..." product-name)
+ (with-temp-buffer
+ (insert "pkginfo/MANIFEST." product-name "\n")
+ (let ((lisp-dir (concat "lisp/" product-name "/"))
+ (files (sort (directory-files "." nil "\\.elc?$") 'string-lessp))
+ file)
+ (while (setq file (pop files))
+ (unless (member file dgnushack-unexported-files)
+ (insert lisp-dir file "\n")))
+ (setq files (sort (directory-files "../texi/" nil
+ dgnushack-info-file-regexp)
+ 'string-lessp))
+ (while (setq file (pop files))
+ (insert lisp-dir file "\n")))
+ (write-file (concat "../MANIFEST." product-name))))))
(defun dgnushack-install-package ()
(let ((package-dir (car command-line-args-left))
- dirs info-dir pkginfo-dir product-name lisp-dir manifest files)
+ (product-name (progn (require 'gnus) (downcase gnus-product-name))))
+
+ ;; Examine PACKAGEDIR.
(unless package-dir
- (when (boundp 'early-packages)
- (setq dirs (delq nil (append (when early-package-load-path
- early-packages)
- (when late-package-load-path
- late-packages)
- (when last-package-load-path
- last-packages))))
- (while (and dirs (not package-dir))
- (when (file-exists-p (car dirs))
- (setq package-dir (car dirs)
- dirs (cdr dirs))))))
+ (let (dirs)
+ (when (boundp 'early-packages)
+ (setq dirs (delq nil (append (when early-package-load-path
+ early-packages)
+ (when late-package-load-path
+ late-packages)
+ (when last-package-load-path
+ last-packages))))
+ (while (and dirs (not package-dir))
+ (when (file-directory-p (car dirs))
+ (setq package-dir (car dirs)
+ dirs (cdr dirs)))))))
(unless package-dir
(error "%s" "
You must specify the name of the package path as follows:
-% make install-package PACKAGEDIR=/usr/local/lib/xemacs/xemacs-packages
-"
- ))
- (setq info-dir (expand-file-name "info/" package-dir)
- pkginfo-dir (expand-file-name "pkginfo/" package-dir))
- (require 'gnus)
- (setq product-name (downcase gnus-product-name)
- lisp-dir (expand-file-name (concat "lisp/" product-name "/")
- package-dir)
- manifest (concat "MANIFEST." product-name))
-
- (unless (file-directory-p lisp-dir)
- (make-directory lisp-dir t))
- (unless (file-directory-p info-dir)
- (make-directory info-dir))
- (unless (file-directory-p pkginfo-dir)
- (make-directory pkginfo-dir))
-
- (setq files
- (sort (delete "dgnuspath.el"
- (delete "dgnuspath.elc"
- (directory-files "." nil "\\.elc?$")))
- 'string-lessp))
- (mapcar
- (lambda (file)
- (unless (or (member file files)
- (not (string-match "\\.elc?$" file)))
- (setq file (expand-file-name file lisp-dir))
- (message "Removing %s..." file)
- (condition-case nil
- (delete-file file)
- (error nil))))
- (directory-files lisp-dir nil nil nil t))
- (mapcar
- (lambda (file)
- (message "Copying %s to %s..." file lisp-dir)
- (copy-file file (expand-file-name file lisp-dir) t t))
- files)
-
- (mapcar
- (lambda (file)
- (message "Copying ../texi/%s to %s..." file info-dir)
- (copy-file (expand-file-name file "../texi/")
- (expand-file-name file info-dir)
- t t))
- (sort (directory-files "../texi/" nil dgnushack-info-file-regexp)
- 'string-lessp))
-
- (message "Copying ../%s to %s..." manifest pkginfo-dir)
- (copy-file (expand-file-name manifest "../")
- (expand-file-name manifest pkginfo-dir) t t)
-
+% make install-package PACKAGEDIR=/usr/local/lib/xemacs/xemacs-packages/"))
+
+ ;; Install lisp files.
+ (let ((lisp-dir (expand-file-name (concat "lisp/" product-name "/")
+ package-dir))
+ (files (sort (directory-files "." nil "\\.elc?$") 'string-lessp)))
+ (unless (file-directory-p lisp-dir)
+ (make-directory lisp-dir t))
+ (dolist (file dgnushack-unexported-files)
+ (setq files (delete file files)))
+ ;; Remove extra files.
+ (dolist (file (directory-files lisp-dir nil nil nil t))
+ (unless (or (member file files)
+ (not (string-match "\\.elc?$" file)))
+ (setq file (expand-file-name file lisp-dir))
+ (message "Removing %s..." file)
+ (condition-case nil
+ (delete-file file)
+ (error nil))))
+ (while (setq file (pop files))
+ (message "Copying %s to %s..." file lisp-dir)
+ (copy-file file (expand-file-name file lisp-dir) t t)))
+
+ ;; Install info files.
+ (let ((files (sort (directory-files "../texi/" nil
+ dgnushack-info-file-regexp)
+ 'string-lessp))
+ (info-dir (expand-file-name "info/" package-dir)))
+ (unless (file-directory-p info-dir)
+ (make-directory info-dir))
+ (while (setq file (pop files))
+ (message "Copying ../texi/%s to %s..." file info-dir)
+ (copy-file (expand-file-name file "../texi/")
+ (expand-file-name file info-dir)
+ t t)))
+
+ ;; Install pkginfo.
+ (let ((manifest (concat "MANIFEST." product-name))
+ (pkginfo-dir (expand-file-name "pkginfo/" package-dir)))
+ (unless (file-directory-p pkginfo-dir)
+ (make-directory pkginfo-dir))
+ (message "Copying ../%s to %s..." manifest pkginfo-dir)
+ (copy-file (expand-file-name manifest "../")
+ (expand-file-name manifest pkginfo-dir) t t))
(message "Done")))
(defun dgnushack-texi-add-suffix-and-format ()
(defun dgnushack-texi-format (&optional addsuffix)
(if (not noninteractive)
(error "batch-texinfo-format may only be used -batch."))
- (require 'texinfmt)
+ (require 'ptexinfmt)
(let ((auto-save-default nil)
(find-file-run-dired nil)
- coding-system-for-write)
+ coding-system-for-write
+ output-coding-system)
(let ((error 0)
file
(files ()))
(t
(setq files (cons file files)
command-line-args-left (cdr command-line-args-left)))))
- (while files
- (setq file (car files)
- files (cdr files))
+ (while (setq file (pop files))
(condition-case err
(progn
(if buffer-file-name (kill-buffer (current-buffer)))
(find-file file)
- (setq coding-system-for-write buffer-file-coding-system)
+ (if (boundp 'MULE)
+ (setq output-coding-system (symbol-value
+ 'file-coding-system))
+ (setq coding-system-for-write buffer-file-coding-system))
(when (and addsuffix
(re-search-forward
"^@setfilename[\t ]+\\([^\t\n ]+\\)" nil t)
projects / elisp / gnus.git- / blobdiff