diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el index 98fc3fea..97d54ba5 100644 --- a/mu4e/mu4e-headers.el +++ b/mu4e/mu4e-headers.el @@ -953,9 +953,9 @@ Also see `mu4e-view-mark-or-move-to-trash'." (define-key map "H" 'mu4e-display-manual) ;; menu - (define-key map [menu-bar] (make-sparse-keymap)) - (let ((menumap (make-sparse-keymap "Headers"))) - (define-key map [menu-bar headers] (cons "Headers" menumap)) + ;;(define-key map [menu-bar] (make-sparse-keymap)) + (let ((menumap (make-sparse-keymap))) + (define-key map [menu-bar headers] (cons "Mu4e" menumap)) (define-key menumap [mu4e~headers-quit-buffer] '("Quit view" . mu4e~headers-quit-buffer)) diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el index 27b63860..76131b39 100644 --- a/mu4e/mu4e-view.el +++ b/mu4e/mu4e-view.el @@ -787,7 +787,17 @@ FUNC should be a function taking two arguments: (define-key map "C" 'mu4e-compose-new) (define-key map "E" 'mu4e-compose-edit) - (define-key map "K" 'ignore) ;; for gnus mode + ;; some gnus things we do not support + (define-key map "G" 'ignore) + (define-key map "I" 'ignore) + (define-key map "J" 'ignore) + (define-key map "K" 'ignore) + (define-key map "L" 'ignore) + (define-key map "N" 'ignore) + (define-key map "V" 'ignore) + (define-key map "X" 'ignore) + (define-key map "Y" 'ignore) + (define-key map "Z" 'ignore) (define-key map "." 'mu4e-view-raw-message) (define-key map "|" 'mu4e-view-pipe) @@ -875,9 +885,9 @@ FUNC should be a function taking two arguments: (define-key map "H" 'mu4e-display-manual) ;; menu - (define-key map [menu-bar] (make-sparse-keymap)) - (let ((menumap (make-sparse-keymap "View"))) - (define-key map [menu-bar headers] (cons "View" menumap)) + ;;(define-key map [menu-bar] (make-sparse-keymap)) + (let ((menumap (make-sparse-keymap))) + (define-key map [menu-bar headers] (cons "Mu4e" menumap)) (define-key menumap [quit-buffer] '("Quit view" . mu4e~view-quit-buffer)) @@ -974,6 +984,7 @@ Gnus' article-mode." (define-key mu4e-view-mode-map [menu-bar Treatment] nil) (define-key mu4e-view-mode-map [menu-bar Article] nil) (define-key mu4e-view-mode-map [menu-bar post] nil) + (define-key mu4e-view-mode-map [menu-bar commands] nil) (setq mu4e~view-buffer-name gnus-article-buffer) (mu4e~view-mode-body)) (define-derived-mode mu4e-view-mode special-mode "mu4e:view" diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index 0f98efa8..7081a8b9 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -932,7 +932,7 @@ headers-view. @section Keybindings Using the below key bindings, you can do various things with these messages; -these actions are also listed in the @t{Headers} menu in the Emacs +these actions are also listed in the @t{Mu4e} menu in the Emacs menu bar. @verbatim @@ -1229,7 +1229,7 @@ prevent this behavior, set @code{mu4e-view-scroll-to-next} to @code{nil}. @node MSGV Keybindings @section Keybindings -You can find most things you can do with this message in the @emph{View} menu, +You can find most things you can do with this message in the @emph{Mu4e} menu, or by using the keyboard; the default bindings are: @verbatim