[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
main 7d541cb6 247/257: Merge remote-tracking branch 'origin/master' into
From: |
Tassilo Horn |
Subject: |
main 7d541cb6 247/257: Merge remote-tracking branch 'origin/master' into externals/auctex |
Date: |
Fri, 19 Apr 2024 15:37:08 -0400 (EDT) |
branch: main
commit 7d541cb66b650aa088cf2fdb823c695481e3ea28
Merge: a8d989d6 17564c27
Author: Tassilo Horn <tsdh@gnu.org>
Commit: Tassilo Horn <tsdh@gnu.org>
Merge remote-tracking branch 'origin/master' into externals/auctex
---
latex.el | 2 ++
plain-tex.el | 4 +++-
tex-site.el.in | 4 ----
tex.el | 2 ++
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/latex.el b/latex.el
index f86e6ebe..1b9a1656 100644
--- a/latex.el
+++ b/latex.el
@@ -8214,6 +8214,8 @@ This happens when \\left is inserted."
(declare-function LaTeX-preview-setup "preview")
+;;;###autoload (if (eq (symbol-function 'LaTeX-mode) 'latex-mode)
+;;;###autoload (defalias 'LaTeX-mode nil))
;;;###autoload
(define-derived-mode LaTeX-mode TeX-mode "LaTeX"
"Major mode in AUCTeX for editing LaTeX files.
diff --git a/plain-tex.el b/plain-tex.el
index 779c30a0..e3ffd53d 100644
--- a/plain-tex.el
+++ b/plain-tex.el
@@ -1,6 +1,6 @@
;;; plain-tex.el --- Support for plain TeX documents. -*- lexical-binding: t;
-*-
-;; Copyright (C) 2010, 2013, 2016-2018, 2021-2022 Free Software Foundation,
Inc.
+;; Copyright (C) 2010, 2013, 2016-2018, 2021-2024 Free Software Foundation,
Inc.
;; Maintainer: auctex-devel@gnu.org
;; Keywords: tex
@@ -115,6 +115,8 @@ plain-TeX file, or any mode derived thereof. See variable
(TeX-abbrev-mode-setup plain-TeX-mode plain-tex-mode-abbrev-table)
+;;;###autoload (if (eq (symbol-function 'plain-TeX-mode) 'plain-tex-mode)
+;;;###autoload (defalias 'plain-TeX-mode nil))
;;;###autoload
(define-derived-mode plain-TeX-mode TeX-mode
;; The mode name can be "plain-TeX", but in that case, we have to
diff --git a/tex-site.el.in b/tex-site.el.in
index 4bd14ce1..5abf351a 100644
--- a/tex-site.el.in
+++ b/tex-site.el.in
@@ -161,10 +161,6 @@ Otherwise, restore AUCTeX definition saved in the symbol
property
(defalias mode (if restore
(get mode 'auctex-function-definition))))))
-;; Delete aliases predefined in tex-mode.el so that AUCTeX
-;; autoloads provided below take precedence.
-(TeX--alias-overlapped-modes)
-
;; COMPATIBILITY for Emacs<29, which executes
;; (defalias 'LaTeX-mode #'latex-mode) etc. in tex-mode.el.
(with-eval-after-load 'tex-mode
diff --git a/tex.el b/tex.el
index eeb7237c..49723108 100644
--- a/tex.el
+++ b/tex.el
@@ -3745,6 +3745,8 @@ other entries will enter `plain-TeX-mode'."
(memq 'font-latex-verbatim-face face)
(eq face 'font-latex-verbatim-face))))))
+;;;###autoload (if (eq (symbol-function 'TeX-mode) 'tex-mode)
+;;;###autoload (defalias 'TeX-mode nil))
(define-derived-mode TeX-mode text-mode "TeX"
"Base mode for AUCTeX major modes except Texinfo mode.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- main 7d541cb6 247/257: Merge remote-tracking branch 'origin/master' into externals/auctex,
Tassilo Horn <=