From df0539d678a9b3519a1952a1f45e941a034ef30a Mon Sep 17 00:00:00 2001
From: Ihor Radchenko <yantar92@posteo.net>
Date: Thu, 14 Sep 2023 12:31:48 +0300
Subject: [PATCH] * lisp/org.el (org-cdlatex-mode): Try to load texmathp

Attempt to load texmathp before setting advice.  `texmathp' is
optional and must be loaded before `cdlatex'.
---
 lisp/org.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lisp/org.el b/lisp/org.el
index 006f3688b..6b68851dd 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15553,6 +15553,10 @@ in Org mode.
 \\{org-cdlatex-mode-map}"
   :lighter " OCDL"
   (when org-cdlatex-mode
+    ;; Try to load texmathp before cdlatex.  Otherwise, cdlatex can
+    ;; bind `cdlatex--texmathp' to `ignore', not using `texmathp' at
+    ;; all.
+    (org-require-package 'texmathp "Auctex")
     (org-require-package 'cdlatex)
     (run-hooks 'cdlatex-mode-hook)
     (cdlatex-compute-tables))