From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 20 Jan 2022 10:00:26 +0000 (+0100)
Subject: Fix execute-extended-command-for-buffer in fundamental-mode
X-Git-Tag: emacs-28.0.92~92
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ba57b78064830caaa253e56decf9686a48fade78;p=emacs.git

Fix execute-extended-command-for-buffer in fundamental-mode

* lisp/simple.el (execute-extended-command-for-buffer): Protect
against the current local map being nil (bug#52907).
---

diff --git a/lisp/simple.el b/lisp/simple.el
index 355ebd690ff..9c17f0ea6d3 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2296,8 +2296,8 @@ maps."
    (let* ((execute-extended-command--last-typed nil)
           (keymaps
            ;; The major mode's keymap and any active minor modes.
-           (cons
-            (current-local-map)
+           (nconc
+            (and (current-local-map) (list (current-local-map)))
             (mapcar
              #'cdr
              (seq-filter