branch: externals/auctex commit 52f903a4e91b1325d696712a768d01fefdf2b25e Author: Ikumi Keita <ik...@ikumi.que.jp> Commit: Ikumi Keita <ik...@ikumi.que.jp>
Take care of `unload-feature' * tex-site.el.in (tex-mode): Deactivate form registered by `with-eval-after-load' if `tex-site' is unloaded. (): Delete unnecessary codes. Current code puts `defalias' rather than `autoload' in tex-site.el for `plain-TeX-mode' and `LaTeX-mode' by "###autoload" cookies. --- tex-site.el.in | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tex-site.el.in b/tex-site.el.in index f788772b13..a17709fd4d 100644 --- a/tex-site.el.in +++ b/tex-site.el.in @@ -47,11 +47,6 @@ ;; auctex.el directly, in the old way. (provide 'tex-site) ;Avoid (re)loading tex-site from auctex-autoloads. - ;; Delete predefined autoloads by tex-mode.el so that AUCTeX - ;; autoloads provided aftarwards take precedence. - (fset 'plain-TeX-mode nil) - (fset 'LaTeX-mode nil) - (load "auctex-autoloads" 'noerror 'nomessage)) ;; Define here in order for `M-x customize-group <RET> AUCTeX <RET>' @@ -150,7 +145,8 @@ set it with `TeX-modes-set'." ;; emacsens version becomes 29 or higher and (defun TeX-LaTeX-mode ;; ...) etc. are turned into (define-derived-mode LaTeX-mode ...) etc. (with-eval-after-load 'tex-mode - (progn + ;; This must be no-op after (unload-feature 'tex-site). + (when (featurep 'tex-site) (defalias 'plain-TeX-mode #'TeX-plain-TeX-mode) (defalias 'LaTeX-mode #'TeX-LaTeX-mode)))