diff options
| author | Juri Linkov <juri@linkov.net> | 2021-01-28 21:27:26 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2021-01-28 21:27:26 +0200 |
| commit | c8c4d65d6510724acd40527a9af67e21e3cf4d5e (patch) | |
| tree | 924e73d0f56ed75fd39841b99ab8da92de95e4af /lisp | |
| parent | 50c7de093a4e699fb86b05b8fdd6b6a47a886106 (diff) | |
| download | emacs-c8c4d65d6510724acd40527a9af67e21e3cf4d5e.tar.gz emacs-c8c4d65d6510724acd40527a9af67e21e3cf4d5e.tar.bz2 emacs-c8c4d65d6510724acd40527a9af67e21e3cf4d5e.zip | |
Use isearch-tmm-menubar when tmm-menubar is called in isearch-mode (bug#43966)
* lisp/isearch.el (isearch-menu-bar-commands): Add tmm-menubar to defaults.
(isearch-mode-map): Remove remapping of tmm-menubar to isearch-tmm-menubar.
* lisp/tmm.el (tmm-menubar): Call isearch-tmm-menubar in isearch-mode.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/isearch.el | 3 | ||||
| -rw-r--r-- | lisp/tmm.el | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index a86678572c4..a1e3fe2c3f0 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -513,7 +513,7 @@ This is like `describe-bindings', but displays only Isearch keys." (call-interactively command))) (defvar isearch-menu-bar-commands - '(isearch-tmm-menubar menu-bar-open mouse-minor-mode-menu) + '(isearch-tmm-menubar tmm-menubar menu-bar-open mouse-minor-mode-menu) "List of commands that can open a menu during Isearch.") (defvar isearch-menu-bar-yank-map @@ -787,7 +787,6 @@ This is like `describe-bindings', but displays only Isearch keys." (define-key map [menu-bar search-menu] (list 'menu-item "Isearch" isearch-menu-bar-map)) - (define-key map [remap tmm-menubar] 'isearch-tmm-menubar) map) "Keymap for `isearch-mode'.") diff --git a/lisp/tmm.el b/lisp/tmm.el index e49246a5c4f..2040f522700 100644 --- a/lisp/tmm.el +++ b/lisp/tmm.el @@ -56,12 +56,14 @@ to invoke `tmm-menubar' instead, customize the variable `tty-menu-open-use-tmm' to a non-nil value." (interactive) (run-hooks 'menu-bar-update-hook) - (let ((menu-bar (menu-bar-keymap)) - (menu-bar-item-cons (and x-position - (menu-bar-item-at-x x-position)))) - (tmm-prompt menu-bar - nil - (and menu-bar-item-cons (car menu-bar-item-cons))))) + (if isearch-mode + (isearch-tmm-menubar) + (let ((menu-bar (menu-bar-keymap)) + (menu-bar-item-cons (and x-position + (menu-bar-item-at-x x-position)))) + (tmm-prompt menu-bar + nil + (and menu-bar-item-cons (car menu-bar-item-cons)))))) ;;;###autoload (defun tmm-menubar-mouse (event) |