;;; 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, 2002, 2003
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
(if (memq 'shift-jis (coding-priority-list))
(set-coding-priority-list
(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
(defalias 'facep 'ignore)
(require 'cl)
-(unless (dolist (var nil t))
- ;; Override the macro `dolist' which may have been defined in egg.el.
+
+(unless (and
+ ;; `dolist' might not be available because of ``-no-autoloads''.
+ (fboundp 'dolist)
+ ;; It may have been defined in egg.el.
+ (dolist (var nil t)))
(load "cl-macs" nil t))
(defvar srcdir (or (getenv "srcdir") "."))
+(defvar loaddir (and load-file-name (file-name-directory load-file-name)))
+
+(defvar dgnushack-w3-directory (let ((w3dir (getenv "W3DIR")))
+ (unless (zerop (length w3dir))
+ (file-name-as-directory w3dir))))
-(defvar dgnushack-w3-dir (let ((w3dir (getenv "W3DIR")))
- (unless (zerop (length w3dir))
- (file-name-as-directory w3dir))))
-(when dgnushack-w3-dir
- (push dgnushack-w3-dir load-path))
+(let ((urldir (getenv "URLDIR")))
+ (unless (zerop (length urldir))
+ (setq urldir (file-name-as-directory urldir))
+ (push (file-name-as-directory urldir) load-path))
+ (when (and dgnushack-w3-directory
+ (not (string-equal urldir dgnushack-w3-directory)))
+ (push dgnushack-w3-directory 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)
-
-(unless (fboundp 'si:byte-optimize-form-code-walker)
- (byte-optimize-form nil);; Load `byte-opt' or `byte-optimize'.
- (setq max-specpdl-size 3000)
- (defalias 'si:byte-optimize-form-code-walker
- (symbol-function 'byte-optimize-form-code-walker))
- (defun byte-optimize-form-code-walker (form for-effect)
+;; 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)))
- ;; Fix bug in and/or forms.
(let ((fn (car form))
(backwards (reverse (cdr form))))
(while (and backwards
(if (and (cdr form) (null backwards))
(byte-compile-log
" all subforms of %s called for effect; deleted" form))
- (if backwards
- (let ((head backwards))
- (while (setq backwards (cdr backwards))
- (setcar backwards (byte-optimize-form (car backwards)
- nil)))
- (cons fn (nreverse head)))))
- (si:byte-optimize-form-code-walker form for-effect)))
- (byte-compile 'byte-optimize-form-code-walker))
-
-(load (expand-file-name "gnus-clfns.el" srcdir) nil t t)
-
-(condition-case nil
- (char-after)
- (wrong-number-of-arguments
- ;; Optimize byte code for `char-after'.
- (put 'char-after 'byte-optimizer 'byte-optimize-char-after)
- (defun byte-optimize-char-after (form)
- (if (null (cdr form))
- '(char-after (point))
- form))))
-
-(condition-case nil
- (char-before)
- (wrong-number-of-arguments
- ;; 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))))
-
-(load (expand-file-name "dgnuspath.el" srcdir) nil nil t)
+ (when backwards
+ (setcdr backwards
+ (mapcar 'byte-optimize-form (cdr backwards))))
+ (setq ad-return-value (cons fn (nreverse backwards))))
+ ad-do-it)))
+
+;; Add `early-package-load-path' to `load-path' for XEmacs. Those paths
+;; won't appear in `load-path' when XEmacs starts with the `-no-autoloads'
+;; option because of a bug. :<
+(when (and (featurep 'xemacs)
+ (string-match "--package-path=\\([^ ]+\\)"
+ system-configuration-options))
+ (let ((paths
+ (apply 'nconc
+ (mapcar
+ (lambda (path)
+ (when (file-directory-p
+ (setq path (expand-file-name "lisp" path)))
+ (directory-files path t)))
+ (split-string (match-string 1 system-configuration-options)
+ "::"))))
+ path adds)
+ (while paths
+ (setq path (car paths)
+ paths (cdr paths))
+ (when (and path
+ (not (or (string-match "/\\.\\.?\\'" path)
+ (member (file-name-as-directory path) load-path)
+ (member path load-path)))
+ (file-directory-p path))
+ (push (file-name-as-directory path) adds)))
+ (setq load-path (nconc (nreverse adds) load-path))))
+
+(if (file-exists-p (expand-file-name "dgnuspath.el" srcdir))
+ (load (expand-file-name "dgnuspath.el" srcdir) nil nil t)
+ (message " ** There's no dgnuspath.el file"))
(condition-case err
(load "~/.lpath.el" t nil t)
;; Don't load path-util until `char-after' and `char-before' have been
;; optimized because it requires `poe' and then modify the functions.
-(or (featurep 'path-util)
- (load "apel/path-util"))
-(add-path "apel")
-(add-path "flim")
+
+;; If the APEL modules are installed under the non-standard directory,
+;; for example "/var/home/john/lisp/apel-VERSION/", you should add that
+;; name using the configure option "--with-addpath=".
+;; And also the directory where the EMU modules are installed, for
+;; example "/usr/local/share/mule/19.34/site-lisp/", it should be
+;; included in the standard `load-path' or added by the configure
+;; option "--with-addpath=".
+(let ((path (or (locate-library "path-util")
+ (locate-library "apel/path-util")));; backward compat.
+ parent lpath)
+ (if path
+ (progn
+ (when (string-match "/$" (setq path (file-name-directory path)))
+ (setq path (substring path 0 (match-beginning 0))))
+ ;; path == "/var/home/john/lisp/apel-VERSION"
+ (when (string-match "/$" (setq parent (file-name-directory path)))
+ (setq parent (substring path 0 (match-beginning 0))))
+ ;; parent == "/var/home/john/lisp"
+ (if (setq lpath (or (member path load-path)
+ (member (file-name-as-directory path) load-path)))
+ (unless (or (member parent load-path)
+ (member (file-name-as-directory parent) load-path))
+ (push parent (cdr lpath)))
+ (push path load-path)
+ (unless (or (member parent load-path)
+ (member (file-name-as-directory parent) load-path))
+ (push parent (cdr load-path))))
+ (require 'advice)
+ (require 'path-util))
+ (error "
+APEL modules are not found in %s.
+Try to re-configure with --with-addpath=APEL_PATH and run make again.
+"
+ load-path)))
+
+(unless (locate-library "mel")
+ (add-path "flim"))
(unless (module-installed-p 'mel)
;; FLIM 1.14 may have installed in two "flim" subdirectories.
(push (expand-file-name "flim"
load-path)
(unless (module-installed-p 'mel)
(error "
-FLIM package does not found in %s.
+FLIM modules does not found in %s.
Try to re-configure with --with-addpath=FLIM_PATH and run make again.
"
- (progn
- (add-path "semi")
- load-path))))
+ load-path)))
(add-path "semi")
+(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 t)
+(push loaddir load-path)
+(load (expand-file-name "lpath.el" loaddir) nil t)
+
+(require 'custom)
;; Bind functions defined by `defun-maybe'.
(put 'defun-maybe 'byte-hunk-handler 'byte-compile-file-form-defun-maybe)
byte-compile-function-environment)))
form)
-(condition-case nil
- :symbol-for-testing-whether-colon-keyword-is-available-or-not
- (void-variable
- ;; Bind keywords.
- (dolist (keyword '(:button-keymap :data :file :mime-handle
- :key-type :value-type))
- (set keyword keyword))))
-
-;; If you are using Mule 2.3 based on Emacs 19.34, you may also put the
-;; following lines in your .emacs file, before gnus related modules are
-;; loaded. It is not always necessary. However if it is done, you will
-;; be able to load or evaluate gnus related *.el (not compiled) files.
-;; ------ cut here ------ cut here ------ cut here ------ cut here ------
-(if (boundp 'MULE)
- (progn
- (setq :version ':version
- :set-after ':set-after)
- (require 'custom)
- (defadvice custom-handle-keyword
- (around dont-signal-an-error-even-if-unsupported-keyword-is-given
- activate)
- "Don't signal an error even if unsupported keyword is given."
- (if (not (memq (ad-get-arg 1) '(:version :set-after)))
- ad-do-it))))
-;; ------ cut here ------ cut here ------ cut here ------ cut here ------
-
-(when (boundp 'MULE)
- (put 'custom-declare-face 'byte-optimizer
- 'byte-optimize-ignore-unsupported-custom-keywords)
- (put 'custom-declare-group 'byte-optimizer
- 'byte-optimize-ignore-unsupported-custom-keywords)
- (defun byte-optimize-ignore-unsupported-custom-keywords (form)
- (if (or (memq ':version (nthcdr 4 form))
- (memq ':set-after (nthcdr 4 form)))
- (let ((newform (list (car form) (nth 1 form)
- (nth 2 form) (nth 3 form)))
- (args (nthcdr 4 form)))
- (while args
- (or (memq (car args) '(:version :set-after))
- (setq newform (nconc newform (list (car args)
- (car (cdr args))))))
- (setq args (cdr (cdr args))))
- newform)
- form))
-
- (put 'custom-declare-variable 'byte-hunk-handler
- 'byte-compile-file-form-custom-declare-variable)
- (defun byte-compile-file-form-custom-declare-variable (form)
- ;; Bind defcustom'ed variables.
- (if (memq 'free-vars byte-compile-warnings)
- (setq byte-compile-bound-variables
- (cons (nth 1 (nth 1 form)) byte-compile-bound-variables)))
- (if (memq ':version (nthcdr 4 form))
- ;; Make the variable uncustomizable.
- `(defvar ,(nth 1 (nth 1 form)) ,(nth 1 (nth 2 form))
- ,(substring (nth 3 form) (if (string-match "^[\t *]+" (nth 3 form))
- (match-end 0)
- 0)))
- ;; Ignore unsupported keyword(s).
- (if (memq ':set-after (nthcdr 4 form))
- (let ((newform (list (car form) (nth 1 form)
- (nth 2 form) (nth 3 form)))
- (args (nthcdr 4 form)))
- (while args
- (or (eq (car args) ':set-after)
- (setq newform (nconc newform (list (car args)
- (car (cdr args))))))
- (setq args (cdr (cdr args))))
- newform)
- form))))
-
;; Unknown variables and functions.
-(unless (boundp 'buffer-file-coding-system)
- (defvar buffer-file-coding-system (symbol-value 'file-coding-system)))
(unless (featurep 'xemacs)
(defalias 'Custom-make-dependencies 'ignore)
(defalias 'update-autoloads-from-directory 'ignore))
-(autoload 'texinfo-parse-line-arg "texinfmt")
(defalias 'device-sound-enabled-p 'ignore)
(defalias 'play-sound-file 'ignore)
(defalias 'ange-ftp-re-read-dir 'ignore)
(defalias 'define-mail-user-agent '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-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-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 (emacs-version>= 21 5)
+ (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 'run-with-idle-timer 'ignore)
+ (defalias 'w3-coding-system-for-mime-charset 'ignore)))
+
+;; T-gnus stuff.
+(eval-and-compile
+ (when (featurep 'xemacs)
+ (autoload 'c-mode "cc-mode" nil t)
+ (autoload 'font-lock-mode "font-lock" nil t)
+ (autoload 'read-kbd-macro "edmacro" nil t)
+ (autoload 'turn-on-font-lock "font-lock" nil t))
+ (autoload 'nnheader-detect-coding-region "nnheader")
+ (autoload 'std11-extract-addresses-components "nnheader")
+ (autoload 'std11-fold-region "nnheader")
+ (autoload 'std11-narrow-to-field "nnheader")
+ (autoload 'std11-unfold-region "nnheader"))
+
(defconst dgnushack-unexporting-files
- (append '("dgnushack.el" "dgnuspath.el" "lpath.el" "ptexinfmt.el")
+ (append '("dgnushack.el" "dgnuspath.el" "dgnuskwds.el" "lpath.el"
+ "legacy-gnus-agent.el")
(unless (or (condition-case code
- (require 'w3-forms)
+ (require 'w3-parse)
(error
- (message "No w3: %s %s retrying..." code
- (locate-library "w3-forms"))
+ (message "No w3: %s%s, retrying..."
+ (error-message-string code)
+ (if (setq code (locate-library "w3-parse"))
+ (concat " (" code ")")
+ ""))
nil))
;; Maybe mis-configured Makefile is used (e.g.
;; configured for FSFmacs but XEmacs is running).
- (let ((lp (delete dgnushack-w3-dir
+ (let ((lp (delete dgnushack-w3-directory
(copy-sequence load-path))))
(if (let ((load-path lp))
(condition-case nil
- (require 'w3-forms)
+ (require 'w3-parse)
(error nil)))
;; If success, fix `load-path' for compiling.
(progn
(setq load-path lp)
(message " => fixed; W3DIR=%s"
(file-name-directory
- (locate-library "w3-forms")))
+ (locate-library "w3-parse")))
t)
(message " => ignored")
nil)))
- '("nnweb.el" "nnlistserv.el" "nnultimate.el"
- "nnslashdot.el" "nnwarchive.el" "webmail.el"
- "nnwfm.el"))
- (condition-case nil
+ '("nnultimate.el" "webmail.el" "nnwfm.el"))
+ (condition-case code
+ (progn (require 'mh-e) nil)
+ (error
+ (message "No mh-e: %s%s (ignored)"
+ (error-message-string code)
+ (if (setq code (locate-library "mh-e"))
+ (concat " (" code ")")
+ ""))
+ '("gnus-mh.el")))
+ (condition-case code
+ (progn (require 'xml) nil)
+ (error
+ (message "No xml: %s%s (ignored)"
+ (error-message-string code)
+ (if (setq code (locate-library "xml"))
+ (concat " (" code ")")
+ ""))
+ '("nnrss.el")))
+ (condition-case code
(progn (require 'bbdb) nil)
- (error '("gnus-bbdb.el")))
+ (error
+ (message "No bbdb: %s%s (ignored)"
+ (error-message-string code)
+ (if (setq code (locate-library "bbdb"))
+ (concat " (" code ")")
+ ""))
+ '("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"))
+ '("gnus-xmas.el" "messagexmas.el" "nnheaderxm.el"
+ "run-at-time.el"))
(when (and (fboundp 'base64-decode-string)
(subrp (symbol-function 'base64-decode-string)))
'("base64.el"))
(when (and (fboundp 'md5) (subrp (symbol-function 'md5)))
- '("md5.el")))
+ '("md5.el"))
+ (when (featurep 'xemacs)
+ '("gnus-load.el")))
"Files which will not be installed.")
(defconst dgnushack-exporting-files
"Print name of files which will be installed."
(princ (mapconcat 'identity dgnushack-exporting-files " ")))
+(defconst dgnushack-dont-compile-files
+ '("gnus-load.el"
+ "mm-bodies.el" "mm-decode.el" "mm-encode.el" "mm-extern.el"
+ "mm-partial.el" "mm-url.el" "mm-uu.el" "mm-view.el" "mml-sec.el"
+ "mml-smime.el" "mml.el" "mml1991.el" "mml2015.el")
+ "Files which should not be byte-compiled.")
+
+(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."))
;; Show `load-path'.
(message "load-path=(\"%s\")"
(file-newer-than-file-p file elc))
(delete-file elc)))
+ ;; Avoid barfing (from gnus-xmas) because the etc directory is not yet
+ ;; installed.
+ (when (featurep 'xemacs)
+ (setq gnus-xmas-glyph-directory "dummy"))
+
(let ((files dgnushack-exporting-files)
;;(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-name-nondirectory file) "c"))))
- (file-newer-than-file-p file elc))
- (ignore-errors
- (byte-compile-file file))))))
+ (unless (member file dgnushack-dont-compile-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)))))))
(defun dgnushack-recompile ()
(require 'gnus)
(byte-recompile-directory "." 0))
-\f
-(defun dgnushack-texi-add-suffix-and-format ()
- (dgnushack-texi-format t))
-
-(defun dgnushack-texi-format (&optional addsuffix)
- (if (not noninteractive)
- (error "batch-texinfo-format may only be used -batch."))
- (require 'ptexinfmt)
- (let ((auto-save-default nil)
- (find-file-run-dired nil)
- coding-system-for-write
- output-coding-system)
- (let ((error 0)
- file
- (files ()))
- (while command-line-args-left
- (setq file (expand-file-name (car command-line-args-left)))
- (cond ((not (file-exists-p file))
- (message ">> %s does not exist!" file)
- (setq error 1
- command-line-args-left (cdr command-line-args-left)))
- ((file-directory-p file)
- (setq command-line-args-left
- (nconc (directory-files file nil nil t)
- (cdr command-line-args-left))))
- (t
- (setq files (cons file files)
- command-line-args-left (cdr command-line-args-left)))))
- (while (setq file (pop files))
- (condition-case err
- (progn
- (if buffer-file-name (kill-buffer (current-buffer)))
- (find-file file)
- (buffer-disable-undo (current-buffer))
- (if (boundp 'MULE)
- (setq output-coding-system (symbol-value
- 'file-coding-system))
- (setq coding-system-for-write buffer-file-coding-system))
- ;; Remove ignored areas first.
- (while (re-search-forward "^@ignore[\t\r ]*$" nil t)
- (delete-region (match-beginning 0)
- (if (re-search-forward
- "^@end[\t ]+ignore[\t\r ]*$" nil t)
- (1+ (match-end 0))
- (point-max))))
- (goto-char (point-min))
- ;; formerly EMACSINFOHACK in texi/Makefile.
- (while (re-search-forward "@\\(end \\)?ifnottex\n*" nil t)
- (replace-match ""))
- (goto-char (point-min))
- ;; Add suffix if it is needed.
- (when (and addsuffix
- (re-search-forward
- "^@setfilename[\t ]+\\([^\t\n ]+\\)" nil t)
- (not (string-match "\\.info$" (match-string 1))))
- (insert ".info")
- (goto-char (point-min)))
- ;; process @include before updating node
- ;; This might produce some problem if we use @lowersection or
- ;; such.
- (let ((input-directory default-directory)
- (texinfo-command-end))
- (while (re-search-forward "^@include" nil t)
- (setq texinfo-command-end (point))
- (let ((filename (concat input-directory
- (texinfo-parse-line-arg))))
- (re-search-backward "^@include")
- (delete-region (point) (save-excursion
- (forward-line 1)
- (point)))
- (message "Reading included file: %s" filename)
- (save-excursion
- (save-restriction
- (narrow-to-region
- (point)
- (+ (point)
- (car (cdr (insert-file-contents filename)))))
- (goto-char (point-min))
- ;; Remove `@setfilename' line from included file,
- ;; if any, so @setfilename command not duplicated.
- (if (re-search-forward "^@setfilename"
- (save-excursion
- (forward-line 100)
- (point))
- t)
- (progn
- (beginning-of-line)
- (delete-region (point) (save-excursion
- (forward-line 1)
- (point))))))))))
- (texinfo-mode)
- (texinfo-every-node-update)
- (set-buffer-modified-p nil)
- (message "texinfo formatting %s..." file)
- (texinfo-format-buffer nil)
- (if (buffer-modified-p)
- (progn (message "Saving modified %s" (buffer-file-name))
- (save-buffer))))
- (error
- (message ">> Error: %s" (prin1-to-string err))
- (message ">> point at")
- (let ((s (buffer-substring (point)
- (min (+ (point) 100)
- (point-max))))
- (tem 0))
- (while (setq tem (string-match "\n+" s tem))
- (setq s (concat (substring s 0 (match-beginning 0))
- "\n>> "
- (substring s (match-end 0)))
- tem (1+ tem)))
- (message ">> %s" s))
- (setq error 1))))
- (kill-emacs error))))
+(defvar dgnushack-gnus-load-file
+ (if (featurep 'xemacs)
+ (expand-file-name "auto-autoloads.el" srcdir)
+ (expand-file-name "gnus-load.el" srcdir)))
+
+(defvar dgnushack-cus-load-file
+ (if (featurep 'xemacs)
+ (expand-file-name "custom-load.el" srcdir)
+ (expand-file-name "cus-load.el" srcdir)))
+
+(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)))
+ (if (featurep 'xemacs)
+ (let ((si:message (symbol-function 'message)))
+ (defun message (fmt &rest args)
+ (cond ((and (string-equal "Generating autoloads for %s..." fmt)
+ (file-exists-p (file-name-nondirectory (car args))))
+ (funcall si:message
+ fmt (file-name-nondirectory (car args))))
+ ((string-equal "No autoloads found in %s" fmt))
+ ((string-equal "Generating autoloads for %s...done" fmt))
+ (t (apply si:message fmt args))))
+ (unwind-protect
+ (batch-update-autoloads)
+ (fset 'message si:message)))
+ (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"))))
\f
(defconst dgnushack-info-file-regexp-en
regexp)
"Regexp matching Japanese info files.")
-(defun dgnushack-make-autoloads ()
- "Make auto-autoloads.el, custom-load.el and then compile them."
- (let ((auto-autoloads (expand-file-name "auto-autoloads.el" srcdir))
- (custom-load (expand-file-name "custom-load.el" srcdir)))
- (unless (and (file-exists-p auto-autoloads)
- (file-exists-p (concat auto-autoloads "c"))
- (file-newer-than-file-p (concat auto-autoloads "c")
- auto-autoloads)
- (file-exists-p custom-load)
- (file-exists-p (concat custom-load "c"))
- (file-newer-than-file-p (concat custom-load "c")
- custom-load))
- (let (make-backup-files)
- (message "Updating autoloads for directory %s..." default-directory)
- (let ((generated-autoload-file auto-autoloads)
- (si:message (symbol-function 'message))
- noninteractive)
- (defun message (fmt &rest args)
- (cond ((and (string-equal "Generating autoloads for %s..." fmt)
- (file-exists-p (file-name-nondirectory (car args))))
- (funcall si:message
- fmt (file-name-nondirectory (car args))))
- ((string-equal "No autoloads found in %s" fmt))
- ((string-equal "Generating autoloads for %s...done" fmt))
- (t (apply si:message fmt args))))
- (unwind-protect
- (update-autoloads-from-directory default-directory)
- (fset 'message si:message)))
- (byte-compile-file auto-autoloads)
- (with-temp-buffer
- (let ((standard-output (current-buffer)))
- (Custom-make-dependencies "."))
- (message "%s" (buffer-string)))
- (require 'cus-load)
- (byte-compile-file custom-load)))))
-
(defun dgnushack-remove-extra-files-in-package ()
"Remove extra files in the lisp directory of the XEmacs package."
(let ((lisp-dir (expand-file-name (concat "lisp/"
"/")
;; PACKAGEDIR
(car command-line-args-left))))
+ (setq command-line-args-left nil)
(when (file-directory-p lisp-dir)
(let (files)
(dolist (file dgnushack-exporting-files)
(defun dgnushack-install-package-manifest ()
"Install MANIFEST file as an XEmacs package."
- (let* ((package-dir (car command-line-args-left))
- (product-name (cadr command-line-args-left))
- (name (expand-file-name (concat "pkginfo/MANIFEST." product-name)
- package-dir))
+ (let* ((package-dir (pop command-line-args-left))
+ (product-name (pop command-line-args-left))
+ (pkginfo-dir (expand-file-name "pkginfo" package-dir))
+ (name (expand-file-name (concat "MANIFEST." product-name)
+ pkginfo-dir))
make-backup-files)
+ (unless (file-directory-p pkginfo-dir)
+ (message "Creating directory %s/..." pkginfo-dir)
+ (make-directory pkginfo-dir))
(message "Generating %s..." name)
(with-temp-file name
(insert "pkginfo/MANIFEST." product-name "\n")
(while (setq file (pop files))
(insert "info/" file "\n"))))))
-\f
-(define-compiler-macro describe-key-briefly (&whole form key &optional insert)
- (if (condition-case nil
- (progn
- (describe-key-briefly '((())) nil)
- t)
- (wrong-number-of-arguments nil);; Old Emacsen.
- (error t))
- form
- (if insert
- `(if ,insert
- (insert (funcall 'describe-key-briefly ,key))
- (funcall 'describe-key-briefly ,key))
- `(funcall 'describe-key-briefly ,key))))
-
;;; dgnushack.el ends here
projects / elisp / gnus.git- / blobdiff