branch: externals/matlab-mode
commit 764b4859744faacd18c2286bd69d877397a140af
Author: John Ciolfi <[email protected]>
Commit: John Ciolfi <[email protected]>
build: enable building with older Emacs 27, 28, or 29
---
matlab--shell-bridge.el | 3 ++-
matlab-ts-langs-install.el | 2 +-
matlab.el | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/matlab--shell-bridge.el b/matlab--shell-bridge.el
index f6409c932d..f6df44af31 100644
--- a/matlab--shell-bridge.el
+++ b/matlab--shell-bridge.el
@@ -13,7 +13,8 @@ Is `matlab-ts-mode' active per
(add-to-list \\='major-mode-remap-alist \\='(matlab-mode . matlab-ts-mode))
If so, require `matlab-ts-mode' else require `matlab-mode'?"
(cond
- ((rassoc 'matlab-ts-mode major-mode-remap-alist)
+ ((and (boundp 'major-mode-remap-alist)
+ (rassoc 'matlab-ts-mode major-mode-remap-alist)) ;;
major-mode-remap-alist came w/ Emacs 29
(require 'matlab-ts-mode)
t)
(t
diff --git a/matlab-ts-langs-install.el b/matlab-ts-langs-install.el
index 28531df9b6..c92d7cac13 100644
--- a/matlab-ts-langs-install.el
+++ b/matlab-ts-langs-install.el
@@ -113,7 +113,7 @@ SLIB-RE is the regexp that matches LANGUAGE.SLIB-EXT."
(dolist (file extracted-files)
(when (string-match slib-re file)
(push (match-string 1 file) all-languages)))
- (setq all-languages (sort all-languages))
+ (setq all-languages (sort all-languages #'string<))
(when (= (length all-languages) 0)
(error "Failed to find any extracted files in %s from command %s"
diff --git a/matlab.el b/matlab.el
index 25c84f33d3..ed1b0ace21 100644
--- a/matlab.el
+++ b/matlab.el
@@ -61,6 +61,7 @@
(require 'derived)
(require 'easymenu)
+(require 'text-property-search)
(eval-when-compile
(require 'elec-pair))
