From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 14 Aug 2021 16:22:57 +0000 (-0400)
Subject: * lisp/emacs-lisp/easymenu.el (easy-menu-do-define): Fix bug#50051
X-Git-Tag: emacs-28.0.90~1504
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf55b5ac17cd5a40ad5ff2e25af7e050602180bb;p=emacs.git

* lisp/emacs-lisp/easymenu.el (easy-menu-do-define): Fix bug#50051

This corrects the quite confused conversion to closure done in
commit a070bd1c8b5213ad469d41dd80d392f924644aed.
---

diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index f6661541a16..360e685ea00 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -175,16 +175,14 @@ This is expected to be bound to a mouse event."
       (set symbol keymap)
       (defalias symbol
 	(lambda (event) (:documentation doc) (interactive "@e")
-	   ;; FIXME: XEmacs uses popup-menu which calls the binding
-	   ;; while x-popup-menu only returns the selection.
 	   (x-popup-menu event
-			 (or (and (symbolp symbol)
+			 (or (and (symbolp keymap)
 				  (funcall
-				   (or (plist-get (get symbol 'menu-prop)
+				   (or (plist-get (get keymap 'menu-prop)
 						  :filter)
                                        #'identity)
-				   (symbol-function symbol)))
-			     symbol))))
+				   (symbol-function keymap)))
+			     keymap))))
       ;; These symbols are commands, but not interesting for users
       ;; to `M-x TAB'.
       (function-put symbol 'completion-predicate #'ignore))
@@ -257,7 +255,7 @@ possibly preceded by keyword pairs as described in `easy-menu-define'."
                      ;; anyway, so we'd better not convert it at all (it will
                      ;; be converted on the fly by easy-menu-filter-return).
                      menu-items
-                   (append menu (mapcar 'easy-menu-convert-item menu-items))))
+                   (append menu (mapcar #'easy-menu-convert-item menu-items))))
       (when prop
 	(setq menu (easy-menu-make-symbol menu 'noexp))
 	(put menu 'menu-prop prop))
@@ -667,7 +665,7 @@ In some cases we use that to select between the local and global maps."
 	    (let* ((name (if path (format "%s" (car (reverse path)))))
 		   (newmap (make-sparse-keymap name)))
 	      (define-key (or map (current-local-map))
-		(apply 'vector (mapcar 'easy-menu-intern path))
+		(apply #'vector (mapcar #'easy-menu-intern path))
 		(if name (cons name newmap) newmap))
 	      newmap))))
   (or (keymapp map) (error "Malformed menu in easy-menu: (%s)" map))