emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 5ab5504: Fix mistake in Lisp conversion of describe-map-tree


From: Stefan Kangas
Subject: master 5ab5504: Fix mistake in Lisp conversion of describe-map-tree
Date: Sun, 1 Nov 2020 16:56:55 -0500 (EST)

branch: master
commit 5ab5504def63ebdfba08169f24a5829353bff137
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    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)
---
 lisp/help.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/help.el b/lisp/help.el
index df055d6..466ff21 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]