From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 17 Oct 2021 10:56:54 +0000 (+0200)
Subject: Fix up recent kbd simplification
X-Git-Tag: emacs-29.0.90~3671^2~538
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a5651a2f927b7758dfdf36953073f1f1a9920f9;p=emacs.git

Fix up recent kbd simplification

* lisp/subr.el (kbd): Fix breakage with X-<foo> from previous change.
---

diff --git a/lisp/subr.el b/lisp/subr.el
index a9669ab750b..6bd3b693b83 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1068,12 +1068,14 @@ and should normally not be needed."
                                     (nreverse lres)
                                     lres))))
       (if (and (not need-vector)
-               (not (memq nil (mapcar (lambda (ch) (<= 0 ch 127))
-                                      (append res nil)))))
+               (not (memq nil (mapcar (lambda (ch)
+                                        (and (numberp ch)
+                                             (<= 0 ch 127)))
+                                      res))))
           (concat (mapcar (lambda (ch)
                             (if (= (logand ch ?\M-\^@) 0)
                                 ch (+ ch 128)))
-                          (append res nil)))
+                          res))
         res))))
 
 (defun undefined ()