From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 6 Feb 2021 11:03:43 +0000 (+0100)
Subject: Allow provided-mode-derived-p to work on aliases
X-Git-Tag: emacs-28.0.90~3911^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2476abc1f24f1b2385648cfb08cd9f178422497d;p=emacs.git

Allow provided-mode-derived-p to work on aliases

* lisp/subr.el (provided-mode-derived-p): Allow this to work on
modes that are aliases of other modes (bug#46331).  For instance:
(provided-mode-derived-p 'javascript-mode 'prog-mode)
---

diff --git a/lisp/subr.el b/lisp/subr.el
index 6e52bd20df2..c1624aa9c02 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2231,6 +2231,10 @@ Affects only hooks run in the current buffer."
   "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.
 If you just want to check `major-mode', use `derived-mode-p'."
+  ;; If MODE is an alias, then look up the real mode function first.
+  (when-let ((alias (symbol-function mode)))
+    (when (symbolp alias)
+      (setq mode alias)))
   (while
       (and
        (not (memq mode modes))