From: Stefan Kangas <stefan@marxist.se>
Date: Sun, 1 Nov 2020 21:49:12 +0000 (+0100)
Subject: Fix mistake in Lisp conversion of describe-map-tree
X-Git-Tag: emacs-28.0.90~5287^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ab5504def63ebdfba08169f24a5829353bff137;p=emacs.git

Fix mistake in Lisp conversion of describe-map-tree

* lisp/help.el (describe-map-tree): Fix mistake in conversion to Lisp
from the C function describe_map_tree; make the condition match the
now removed C code.  (Bug#44360)
---

diff --git a/lisp/help.el b/lisp/help.el
index df055d602fe..466ff21eb2d 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1189,8 +1189,8 @@ Any inserted text ends in two newlines (used by
                 ;; map.
                 (or (keymapp sub-shadows)
                     (null sub-shadows)
-                    (consp sub-shadows)
-                    (not (keymapp (car sub-shadows)))))
+                    (and (consp sub-shadows)
+                         (keymapp (car sub-shadows)))))
           ;; Maps we have already listed in this loop shadow this map.
           (let ((tail orig-maps))
             (while (not (equal tail maps))