From 1a4ed8ee7843b7cb929f066781a4a754bebf0f4d Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@linkov.net>
Date: Wed, 18 Aug 2021 20:01:03 +0300
Subject: [PATCH] * lisp/mouse.el: More fixes for context-menu.

(context-menu-map): Remove menu title "Context Menu" (bug#50067).
(context-menu-minor): Reverse sub-menus to display exactly in the same order
as on the menu bar.
---
 etc/NEWS      | 5 ++---
 lisp/mouse.el | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index cc779b40f45..b221f136241 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -396,9 +396,8 @@ onto 'file-name-history'.
 *** New minor mode 'context-menu-mode' for context menus popped by 'mouse-3'.
 When this mode is enabled, clicking 'down-mouse-3' anywhere in the buffer
 pops up a menu whose contents depends on surrounding context near the
-mouse click.  You can customize the order of the default sub-menus in
-the context menu by customizing the user option
-'context-menu-functions'.
+mouse click.  You can change the order of the default sub-menus in the
+context menu by customizing the user option 'context-menu-functions'.
 
 +++
 *** The "Edit => Clear" menu item now obeys a rectangular region.
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 54240397001..d2a5200d8de 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -304,7 +304,7 @@ the same menu with changes such as added new menu items."
 
 (defun context-menu-map ()
   "Return composite menu map."
-  (let ((menu (make-sparse-keymap "Context Menu")))
+  (let ((menu (make-sparse-keymap)))
     (run-hook-wrapped 'context-menu-functions
                       (lambda (fun)
                         (setq menu (funcall fun menu))
@@ -341,7 +341,7 @@ the same menu with changes such as added new menu items."
   "Minor modes submenus."
   (run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
   (define-key-after menu [separator-minor] menu-bar-separator)
-  (dolist (mode (minor-mode-key-binding [menu-bar]))
+  (dolist (mode (reverse (minor-mode-key-binding [menu-bar])))
     (when (and (consp mode) (symbol-value (car mode)))
       (map-keymap (lambda (key binding)
                     (when (consp binding)
-- 
2.39.2