From 60ca7d6e4666d12a2fb4a7b6b161919b46627d10 Mon Sep 17 00:00:00 2001 From: djcb Date: Thu, 15 Dec 2011 08:51:39 +0200 Subject: [PATCH] * mu4e: set keybindings FREC for forward, reply, edit, compose --- emacs/mu4e-hdrs.el | 16 ++++++++++------ emacs/mu4e-main.el | 14 +++++++++++--- emacs/mu4e-view.el | 13 +++++++++---- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/emacs/mu4e-hdrs.el b/emacs/mu4e-hdrs.el index 521fe304..c7f4a8ea 100644 --- a/emacs/mu4e-hdrs.el +++ b/emacs/mu4e-hdrs.el @@ -277,19 +277,23 @@ after the end of the search results." (define-key map "x" 'mu4e-execute-marks) ;; message composition - (define-key map "r" 'mu4e-compose-reply) - (define-key map "f" 'mu4e-compose-forward) - (define-key map "c" 'mu4e-compose-new) - (define-key map "e" 'mu4e-edit-draft) + (define-key map "R" 'mu4e-compose-reply) + (define-key map "F" 'mu4e-compose-forward) + (define-key map "C" 'mu4e-compose-new) + (define-key map "E" 'mu4e-edit-draft) (define-key map (kbd "RET") 'mu4e-view-message) + (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 menumap [quit-buffer] '("Quit view" . mu4e-quit-buffer)) + (define-key menumap [display-help] '("Help" . mu4e-display-manual)) + (define-key menumap [sepa0] '("--")) (define-key menumap [execute-marks] '("Execute marks" . mu4e-execute-marks)) @@ -306,9 +310,9 @@ after the end of the search results." (define-key menumap [sepa2] '("--")) (define-key menumap [refresh] '("Refresh" . mu4e-rerun-search)) - (define-key menumap [search] '("Search" . mu4e-search)) (define-key menumap [search-full] '("Search full" . mu4e-search-full)) - + (define-key menumap [search] '("Search" . mu4e-search)) + (define-key menumap [jump] '("Jump to maildir" . mu4e-jump-to-maildir)) (define-key menumap [sepa3] '("--")) diff --git a/emacs/mu4e-main.el b/emacs/mu4e-main.el index bdff638a..b316bcbe 100644 --- a/emacs/mu4e-main.el +++ b/emacs/mu4e-main.el @@ -40,12 +40,14 @@ (define-key map "S" 'mu4e-search-full) (define-key map "q" 'mu4e-quit-mm) (define-key map "j" 'mu4e-jump-to-maildir) - (define-key map "c" 'mu4e-compose-new) + (define-key map "C" 'mu4e-compose-new) (define-key map "m" 'mu4e-toggle-mail-sending-mode) (define-key map "f" 'smtpmail-send-queued-mail) (define-key map "u" 'mu4e-retrieve-mail-update-db) + (define-key map "H" 'mu4e-display-manual) + map) "Keymap for the *mu4e-main* buffer.") (fset 'mu4e-main-mode-map mu4e-main-mode-map) @@ -88,7 +90,7 @@ (propertize " Basics\n\n" 'face 'mu4e-title-face) (mu4e-action-str "\t* [j]ump to some maildir\n") (mu4e-action-str "\t* enter a [s]earch query\n") - (mu4e-action-str "\t* [c]ompose a new message\n") + (mu4e-action-str "\t* [C]ompose a new message\n") "\n" (propertize " Bookmarks\n\n" 'face 'mu4e-title-face) (mapconcat @@ -106,6 +108,7 @@ 'face 'mu4e-view-header-key-face) ")\n" (mu4e-action-str "\t* [f]lush queued mail\n") "\n" + (mu4e-action-str "\t* [H]elp\n") (mu4e-action-str "\t* [q]uit mm\n")) (mu4e-main-mode) (switch-to-buffer buf)))) @@ -130,11 +133,16 @@ "Outgoing mail will now be sent directly")) (mu4e)) +(defun mu4e-display-manual () + "Display the mu4e manual info pages." + (interactive) + (info-display-manual "mu4e")) + (defun mu4e-quit-mm() "Quit the mm session." (interactive) - (when (y-or-n-p "Are you sure you want to quit mm? ") + (when (y-or-n-p "Are you sure you want to quit? ") (message nil) (mu4e-kill-proc) (kill-buffer))) diff --git a/emacs/mu4e-view.el b/emacs/mu4e-view.el index a81f4643..ef019363 100644 --- a/emacs/mu4e-view.el +++ b/emacs/mu4e-view.el @@ -210,10 +210,11 @@ or if not available, :body-html converted to text)." (define-key map "j" 'mu4e-jump-to-maildir) (define-key map "g" 'mu4e-view-go-to-url) - (define-key map "f" 'mu4e-compose-forward) - (define-key map "r" 'mu4e-compose-reply) - (define-key map "c" 'mu4e-compose-new) - (define-key map "e" 'mu4e-edit-draft) + + (define-key map "F" 'mu4e-compose-forward) + (define-key map "R" 'mu4e-compose-reply) + (define-key map "C" 'mu4e-compose-new) + (define-key map "E" 'mu4e-edit-draft) (define-key map "." 'mu4e-view-raw) (define-key map "|" 'mu4e-view-pipe) @@ -260,12 +261,15 @@ or if not available, :body-html converted to text)." (define-key map "U" 'mu4e-view-unmark) (define-key map "x" 'mu4e-view-marked-execute) + (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 menumap [quit-buffer] '("Quit view" . mu4e-view-quit-buffer)) + (define-key menumap [display-help] '("Help" . mu4e-display-manual)) (define-key menumap [sepa0] '("--")) (define-key menumap [wrap-lines] @@ -301,6 +305,7 @@ or if not available, :body-html converted to text)." (define-key menumap [reply] '("Reply" . mu4e-compose-reply)) (define-key menumap [sepa3] '("--")) + (define-key menumap [search-full] '("Search full" . mu4e-search-full)) (define-key menumap [search] '("Search" . mu4e-search)) (define-key menumap [jump] '("Jump to maildir" . mu4e-jump-to-maildir))