branch: elpa/lua-mode
commit cae5db6a4dc8858b6db10fdbc126120a8f3463e9
Author: immerrr <[email protected]>
Commit: immerrr <[email protected]>
Fix derived-mode-p test
---
lua-mode.el | 6 +++---
test/test-generic.el | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lua-mode.el b/lua-mode.el
index 3126d21..b34d1dd 100644
--- a/lua-mode.el
+++ b/lua-mode.el
@@ -192,8 +192,8 @@ element is itself expanded with `lua-rx-to-string'. "
`(set (make-local-variable (quote ,var)) ,val)))
;; Backward compatibility for Emacsen < 24.1
- (defalias 'lua--prog-mode
- (if (fboundp 'prog-mode) 'prog-mode 'fundamental-mode))
+ (unless (fboundp 'prog-mode)
+ (define-derived-mode prog-mode fundamental-mode "Prog"))
(defalias 'lua--cl-assert
(if (fboundp 'cl-assert) 'cl-assert 'assert))
@@ -714,7 +714,7 @@ Groups 6-9 can be used in any of argument regexps."
"`lua-mode' syntax table.")
;;;###autoload
-(define-derived-mode lua-mode lua--prog-mode "Lua"
+(define-derived-mode lua-mode prog-mode "Lua"
"Major mode for editing Lua code."
:abbrev-table lua-mode-abbrev-table
:syntax-table lua-mode-syntax-table
diff --git a/test/test-generic.el b/test/test-generic.el
index 226362d..d7b6880 100644
--- a/test/test-generic.el
+++ b/test/test-generic.el
@@ -71,3 +71,9 @@
"end"))
(beginning-of-defun)
(expect (looking-at (rx "function foo.bar:baz (x,y,z)"))))))
+
+
+(describe "lua-mode"
+ (it "is derived from prog-mode"
+ (with-lua-buffer
+ (expect (derived-mode-p 'prog-mode)))))