[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 4b90e4f: Revert "Sort the items in 'mode-line-mode-menu' before d
From: |
Lars Ingebrigtsen |
Subject: |
master 4b90e4f: Revert "Sort the items in 'mode-line-mode-menu' before displaying the menu" |
Date: |
Wed, 23 Jun 2021 10:11:20 -0400 (EDT) |
branch: master
commit 4b90e4f44f9c8698da66c41141ad5693aadc86a1
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Revert "Sort the items in 'mode-line-mode-menu' before displaying the menu"
This reverts commit d4d6d8f335165e2bda8942b4acd45e5bab613b70.
This approach doesn't work on certain types of keymaps, so it should be
implemented in a different way.
---
lisp/bindings.el | 36 ++++--------------------------------
1 file changed, 4 insertions(+), 32 deletions(-)
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 8d902ba..620f289 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -330,50 +330,22 @@ of the menu's data."
(defvar mode-line-mode-menu (make-sparse-keymap "Minor Modes") "\
Menu of mode operations in the mode line.")
-(defun bindings--menu-item-string (item)
- "Return the menu-item string for ITEM, or nil if not a menu-item."
- (cond
- ((not (consp item)) nil) ; Not a menu-item.
- ((eq 'menu-item (car item))
- (eval (cadr item)))
- ((stringp (car item))
- (car item))
- (t nil))) ; Not a menu-item either.
-
-(defun bindings--sort-keymap (keymap)
- "Sort the bindings in KEYMAP in alphabetical order.
-The order of bindings in a keymap matters only when it is used as
-a menu, so this function is not useful for non-menu keymaps."
- (unless (keymapp keymap)
- (signal 'wrong-type-argument (list 'keymapp keymap)))
- (setcdr keymap
- (sort (cdr keymap)
- (lambda (a b)
- (string< (bindings--menu-item-string (cdr-safe a))
- (bindings--menu-item-string (cdr-safe b))))))
- keymap)
-
(defvar mode-line-major-mode-keymap
(let ((map (make-sparse-keymap)))
(bindings--define-key map [mode-line down-mouse-1]
`(menu-item "Menu Bar" ignore
:filter ,(lambda (_) (mouse-menu-major-mode-map))))
(define-key map [mode-line mouse-2] 'describe-mode)
- (bindings--define-key map [mode-line down-mouse-3]
- `(menu-item "Menu Bar" ,mode-line-mode-menu
- :filter bindings--sort-keymap))
+ (define-key map [mode-line down-mouse-3] mode-line-mode-menu)
map) "\
Keymap to display on major mode.")
(defvar mode-line-minor-mode-keymap
- (let ((map (make-sparse-keymap))
- (mode-menu-binding
- `(menu-item "Menu Bar" ,mode-line-mode-menu
- :filter bindings--sort-keymap)))
+ (let ((map (make-sparse-keymap)))
(define-key map [mode-line down-mouse-1] 'mouse-minor-mode-menu)
(define-key map [mode-line mouse-2] 'mode-line-minor-mode-help)
- (define-key map [mode-line down-mouse-3] mode-menu-binding)
- (define-key map [header-line down-mouse-3] mode-menu-binding)
+ (define-key map [mode-line down-mouse-3] mode-line-mode-menu)
+ (define-key map [header-line down-mouse-3] mode-line-mode-menu)
map) "\
Keymap to display on minor modes.")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 4b90e4f: Revert "Sort the items in 'mode-line-mode-menu' before displaying the menu",
Lars Ingebrigtsen <=