branch: elpa/lua-mode
commit 9454aeeb665df360543b47e162f03276a16b01a5
Merge: 4e346d4 cf076a6
Author: immerrr again <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #187 from immerrr/re-enable-emacs-24
Re enable tests for emacs 24
---
.github/workflows/test.yml | 2 +-
test/test-process.el | 4 ++--
test/utils.el | 9 +++++++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1c423ef..106f067 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
matrix:
os: [ubuntu-latest]
emacs_version:
- # - '24.3'
+ - '24.3'
- '25.1'
- '25.3'
- '26.1'
diff --git a/test/test-process.el b/test/test-process.el
index bedb11c..5f3870e 100644
--- a/test/test-process.el
+++ b/test/test-process.el
@@ -10,13 +10,13 @@
(it "doesn't hang for an already-running process"
;; Acquire a *lua* repl buffer
(save-current-buffer
- (funcall-interactively #'lua-start-process)
+ (call-interactively #'lua-start-process)
;; Input some text
(with-current-buffer lua-process-buffer
(insert "table.insert"))
(switch-to-buffer (get-buffer-create "*scratch*"))
;; Try restarting the repl buffer
- (funcall-interactively #'lua-start-process)
+ (call-interactively #'lua-start-process)
;; `lua-start-process' shouldn't hang, and it should have switched back.
(expect (current-buffer) :to-be lua-process-buffer))))
diff --git a/test/utils.el b/test/utils.el
index 6fc7912..b8f26be 100644
--- a/test/utils.el
+++ b/test/utils.el
@@ -127,10 +127,15 @@ This is a mere typing/reading aid for lua-mode's
font-lock tests."
(defmacro with-lua-buffer (&rest body)
(declare (debug (&rest form)))
`(with-temp-buffer
- (lua-mode)
+ ;; font-lock is not activated if buffer name is temporary (starts with a
+ ;; space) and if `noninteractive' is non-nil. Ensure tests that use
+ ;; font-lock still work.
+ (rename-buffer "temp-buffer.lua" t)
+ (let (noninteractive)
+ (lua-mode)
+ (font-lock-mode 1))
(set (make-local-variable 'lua-process) nil)
(set (make-local-variable 'lua-process-buffer) nil)
- (font-lock-fontify-buffer)
(pop-to-buffer (current-buffer))
(unwind-protect
(progn ,@body)
