XEmacs AUC Tex package: "@AUCDIR" in load-path

The default tex-site.el from the AUC TeX package does a number of weird things, including consing "＠AUCDIR" on the front of load-path. It also duplicates a bunch of autoloads that XEmacs normally does via auto-autoloads.el. On the other hand, I can't really dispense with `(require 'tex-site)', since AUC TeX (properly) IMHO defers to tex-mode.el in the core for tex-mode and latex-mode. What I propose doing is wrapping those parts of tex-site.el that don't need to be done for a properly installed XEmacs package in (unless (featurep 'auctex-autoloads) ...) This should be sufficiently XEmacs-specific to not mess up FSF users. However, I don't know AUC TeX internals well and don't have time right now to track down any possible dependencies there. Any takers? Possible patch attached: Index: wp/auctex/tex-site.el =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs-packages/wp/auctex/tex-site.el,v retrieving revision 1.3 diff -u -r1.3 tex-site.el --- tex-site.el 2000/01/19 12:32:53 1.3 +++ tex-site.el 2000/12/13 08:02:16 ＠＠ -57,35 +57,44 ＠＠ ;; Copy variables you need to change from the start of `tex.el' and ;; insert them here. -(defvar TeX-lisp-directory "＠AUCDIR" - "*The directory where the AUC TeX lisp files are located.") +;; Uncomment and replace ＠AUCDIR with the path to AUC TeX. +;; You should not need to do this for an installed XEmacs AUC TeX package. +;; If you can't figure out how to do without it, please report a bug. +;(defvar TeX-lisp-directory "＠AUCDIR" +; "*The directory where the AUC TeX lisp files are located.") ;;; Autoloads: -(or (assoc TeX-lisp-directory (mapcar 'list load-path)) ;No `member' yet. - (assoc (substring TeX-lisp-directory 0 -1) ;Without trailing slash. - (mapcar 'list load-path)) - (setq load-path (cons TeX-lisp-directory load-path))) +(unless (featurep 'auctex-autoloads) + ;; auto-autoloaded by XEmacs AUC TeX package + (or (assoc TeX-lisp-directory (mapcar 'list load-path)) ;No `member' yet. + (assoc (substring TeX-lisp-directory 0 -1) ;Without trailing slash. + (mapcar 'list load-path)) + (setq load-path (cons TeX-lisp-directory load-path))) + (autoload 'BibTeX-auto-store "latex" no-doc t) + + (autoload 'ams-tex-mode "tex" no-doc t) + (autoload 'TeX-auto-generate "tex" no-doc t) + (autoload 'TeX-auto-generate-global "tex" no-doc t) + (autoload 'TeX-insert-quote "tex" no-doc t) + (autoload 'TeX-submit-bug-report "tex" no-doc t) + (autoload 'japanese-plain-tex-mode "tex-jp" no-doc t) + (autoload 'japanese-latex-mode "tex-jp" no-doc t)) + ;; This hook will store bibitems when you save a BibTeX buffer. (defvar bibtex-mode-hook nil) (or (memq 'BibTeX-auto-store bibtex-mode-hook) ;No `add-hook' yet. (setq bibtex-mode-hook (cons 'BibTeX-auto-store bibtex-mode-hook))) - -(autoload 'BibTeX-auto-store "latex" no-doc t) +;; These are _not_ autoloaded by the XEmacs AUC TeX package because they +;; conflict with the definitions provided by the tex-mode.el in the core. (autoload 'tex-mode "tex" no-doc t) (autoload 'plain-tex-mode "tex" no-doc t) -(autoload 'ams-tex-mode "tex" no-doc t) -(autoload 'TeX-auto-generate "tex" no-doc t) -(autoload 'TeX-auto-generate-global "tex" no-doc t) -(autoload 'TeX-insert-quote "tex" no-doc t) -(autoload 'TeX-submit-bug-report "tex" no-doc t) -(autoload 'japanese-plain-tex-mode "tex-jp" no-doc t) -(autoload 'japanese-latex-mode "tex-jp" no-doc t) +(autoload 'latex-mode "latex" no-doc t) + (autoload 'japanese-slitex-mode "tex-jp" no-doc t) (autoload 'texinfo-mode "tex-info" no-doc t) -(autoload 'latex-mode "latex" no-doc t) (provide 'tex-site) -- University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Institute of Policy and Planning Sciences Tel/fax: +81 (298) 53-5091 _________________ _________________ _________________ _________________ What are those straight lines for? "XEmacs rules."