master 5a5651a: Fix up recent kbd simplification

[Lars Ingebrigtsen]

branch: master
commit 5a5651a2f927b7758dfdf36953073f1f1a9920f9
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Fix up recent kbd simplification
    
    * lisp/subr.el (kbd): Fix breakage with X-<foo> from previous change.
---
 lisp/subr.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lisp/subr.el b/lisp/subr.el
index a9669ab..6bd3b69 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 ()