From: Tomi Ollila Date: Sun, 15 Sep 2013 08:35:05 +0000 (+0300) Subject: Re: [PATCH] contrib: pick: use global keymap X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cdfbd52a839157387762e8c39191adb1acf08a90;p=notmuch-archives.git Re: [PATCH] contrib: pick: use global keymap --- diff --git a/68/f63aa001047b4e36beca898d0df3fa76ef04ac b/68/f63aa001047b4e36beca898d0df3fa76ef04ac new file mode 100644 index 000000000..b142f274c --- /dev/null +++ b/68/f63aa001047b4e36beca898d0df3fa76ef04ac @@ -0,0 +1,126 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 48A7F431FAF + for ; Sun, 15 Sep 2013 01:35:15 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id zSkmIfZsb7Wi for ; + Sun, 15 Sep 2013 01:35:10 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 50D63431FAE + for ; Sun, 15 Sep 2013 01:35:10 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id B37F11000B2; + Sun, 15 Sep 2013 11:35:05 +0300 (EEST) +From: Tomi Ollila +To: Mark Walters , notmuch@notmuchmail.org +Subject: Re: [PATCH] contrib: pick: use global keymap +In-Reply-To: <1379233068-9626-1-git-send-email-markwalters1009@gmail.com> +References: <1379233068-9626-1-git-send-email-markwalters1009@gmail.com> +User-Agent: Notmuch/0.16+77~g2561895 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 15 Sep 2013 08:35:15 -0000 + +On Sun, Sep 15 2013, Mark Walters wrote: + +> Austin recently introduced a new global keymap. This makes pick use +> this global map. +> +> In most cases pick needs to override this global map because +> it wants to close the message pane before doing the action. However, +> this documents the over-rides and makes it less likely that the pick +> bindings will get out of sync with the main bindings. +> --- + +LGTM. + +Tomi + +> contrib/notmuch-pick/notmuch-pick.el | 16 ++++++++++++---- +> 1 files changed, 12 insertions(+), 4 deletions(-) +> +> diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el +> index cba9549..01ca4bd 100644 +> --- a/contrib/notmuch-pick/notmuch-pick.el +> +++ b/contrib/notmuch-pick/notmuch-pick.el +> @@ -230,6 +230,17 @@ FUNC." +> +> (defvar notmuch-pick-mode-map +> (let ((map (make-sparse-keymap))) +> + (set-keymap-parent map notmuch-common-keymap) +> + ;; The following override the global keymap. +> + ;; Override because we want to close message pane first. +> + (define-key map "?" (notmuch-pick-close-message-pane-and #'notmuch-help)) +> + ;; Override because we first close message pane and then close pick buffer. +> + (define-key map "q" 'notmuch-pick-quit) +> + ;; Override because we close message pane after the search query is entered. +> + (define-key map "s" 'notmuch-pick-to-search) +> + ;; Override because we want to close message pane first. +> + (define-key map "m" (notmuch-pick-close-message-pane-and #'notmuch-mua-new-mail)) +> + +> (define-key map [mouse-1] 'notmuch-pick-show-message) +> ;; these use notmuch-show functions directly +> (define-key map "|" 'notmuch-show-pipe-message) +> @@ -244,20 +255,16 @@ FUNC." +> (define-key map "e" (notmuch-pick-to-message-pane #'notmuch-pick-button-activate)) +> +> ;; bindings from show (or elsewhere) but we close the message pane first. +> - (define-key map "m" (notmuch-pick-close-message-pane-and #'notmuch-mua-new-mail)) +> (define-key map "f" (notmuch-pick-close-message-pane-and #'notmuch-show-forward-message)) +> (define-key map "r" (notmuch-pick-close-message-pane-and #'notmuch-show-reply-sender)) +> (define-key map "R" (notmuch-pick-close-message-pane-and #'notmuch-show-reply)) +> (define-key map "V" (notmuch-pick-close-message-pane-and #'notmuch-show-view-raw-message)) +> - (define-key map "?" (notmuch-pick-close-message-pane-and #'notmuch-help)) +> +> ;; The main pick bindings +> - (define-key map "q" 'notmuch-pick-quit) +> (define-key map "x" 'notmuch-pick-quit) +> (define-key map "A" 'notmuch-pick-archive-thread) +> (define-key map "a" 'notmuch-pick-archive-message-then-next) +> (define-key map "=" 'notmuch-pick-refresh-view) +> - (define-key map "s" 'notmuch-pick-to-search) +> (define-key map "z" 'notmuch-pick-to-pick) +> (define-key map "n" 'notmuch-pick-next-matching-message) +> (define-key map "p" 'notmuch-pick-prev-matching-message) +> @@ -849,6 +856,7 @@ Complete list of currently available key bindings: +> +> (interactive) +> (kill-all-local-variables) +> + (setq notmuch-buffer-refresh-function #'notmuch-pick-refresh-view) +> (use-local-map notmuch-pick-mode-map) +> (setq major-mode 'notmuch-pick-mode +> mode-name "notmuch-pick") +> -- +> 1.7.9.1 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch