From: Trevor Murphy <trevormurphy@google.com>
Date: Thu, 1 Oct 2020 22:30:19 +0000 (+0200)
Subject: Fix check for derived modes in display-buffer-reuse-mode-window
X-Git-Tag: emacs-28.0.90~5775
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=40b81f847f12cf141467a02858d1ac09589cea2f;p=emacs.git

Fix check for derived modes in display-buffer-reuse-mode-window

* lisp/window.el (display-buffer-reuse-mode-window): Make the
check for derived modes actually work (bug#38677).
---

diff --git a/lisp/window.el b/lisp/window.el
index 9aca94d502a..5ed7a62bcf6 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7712,7 +7712,7 @@ indirectly called by the latter."
                (with-current-buffer (window-buffer window)
                  (cond ((memq major-mode allowed-modes)
                         'same)
-                       ((derived-mode-p allowed-modes)
+                       ((apply #'derived-mode-p allowed-modes)
                         'derived)))))
           (when (and mode?
                      (not (and inhibit-same-window-p