mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
Code Issues Releases Activity

Support mode aliases in 'provided-mode-derived-p'

Browse Source 
* lisp/subr.el (provided-mode-derived-p): Check aliases of
MODES as well as MODES themselves.  (Bug#32795)

* test/lisp/subr-tests.el (provided-mode-derived-p): New test.

Copyright-paperwork-exempt: yes
This commit is contained in:
Andrew Schwartzmeyer 2018-09-24 21:09:39 -07:00 committed by Eli Zaretskii
parent c973a0f15e
commit 48ff4c0b2f
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/NEWS
View File

@ -982,6 +982,11 @@ This works like 'dolist', but reports progress similar to
This works like 'delete-frame-functions', but runs after the frame to This works like 'delete-frame-functions', but runs after the frame to
be deleted has been made dead and removed from the frame list. be deleted has been made dead and removed from the frame list.
---
** The function 'provided-mode-derived-p' was extended to support aliases.
The function now returns non-nil when the argument MODE is derived
from any alias of any of MODES.
+++ +++
** New frame focus state inspection interface. ** New frame focus state inspection interface.
The hooks 'focus-in-hook' and 'focus-out-hook' are now obsolete. The hooks 'focus-in-hook' and 'focus-out-hook' are now obsolete.

10
lisp/subr.el
View File

@ -1918,11 +1918,15 @@ Only affects hooks run in the current buffer."
;; PUBLIC: find if the current mode derives from another. ;; PUBLIC: find if the current mode derives from another.
(defun provided-mode-derived-p (mode &rest modes) (defun provided-mode-derived-p (mode &rest modes)
"Non-nil if MODE is derived from one of MODES. "Non-nil if MODE is derived from one of MODES or their aliases.
Uses the `derived-mode-parent' property of the symbol to trace backwards. Uses the `derived-mode-parent' property of the symbol to trace backwards.
If you just want to check `major-mode', use `derived-mode-p'." If you just want to check `major-mode', use `derived-mode-p'."
(while (and (not (memq mode modes)) (while
(setq mode (get mode 'derived-mode-parent)))) (and
(not (memq mode modes))
(let* ((parent (get mode 'derived-mode-parent))
(parentfn (symbol-function parent)))
(setq mode (if (and parentfn (symbolp parentfn)) parentfn parent)))))
mode) mode)
(defun derived-mode-p (&rest modes) (defun derived-mode-p (&rest modes)

12
test/lisp/subr-tests.el
View File

@ -61,6 +61,18 @@
(quote (quote
(0 font-lock-keyword-face)))))))) (0 font-lock-keyword-face))))))))
(ert-deftest provided-mode-derived-p ()
;; base case: `derived-mode' directly derives `prog-mode'
(should (progn
(define-derived-mode derived-mode prog-mode "test")
(provided-mode-derived-p 'derived-mode 'prog-mode)))
;; edge case: `derived-mode' derives an alias of `prog-mode'
(should (progn
(defalias 'parent-mode
(if (fboundp 'prog-mode) 'prog-mode 'fundamental-mode))
(define-derived-mode derived-mode parent-mode "test")
(provided-mode-derived-p 'derived-mode 'prog-mode))))
(ert-deftest number-sequence-test () (ert-deftest number-sequence-test ()
(should (= (length (should (= (length
(number-sequence (1- most-positive-fixnum) most-positive-fixnum)) (number-sequence (1- most-positive-fixnum) most-positive-fixnum))