Re: [PATCH] contrib: pick: use global keymap

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