33/89a9814649b6adfd144a5d879ce7da22b7a1fa

   1 Return-Path: <markwalters1009@gmail.com>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id C6478431FAF\r
   6         for <notmuch@notmuchmail.org>; Sun, 15 Sep 2013 07:35:23 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0.201\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
  14         RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id XN0-LWi5Igo5 for <notmuch@notmuchmail.org>;\r
  18         Sun, 15 Sep 2013 07:35:18 -0700 (PDT)\r
  19 Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com\r
  20  [74.125.82.53])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  21  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  22  AF8DD431FBD    for <notmuch@notmuchmail.org>; Sun, 15 Sep 2013 07:35:15 -0700\r
  23  (PDT)\r
  24 Received: by mail-wg0-f53.google.com with SMTP id x12so2784383wgg.20\r
  25         for <notmuch@notmuchmail.org>; Sun, 15 Sep 2013 07:35:14 -0700 (PDT)\r
  26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  27         h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
  28         bh=3QHcwDOBWhJS3LxzIvtNr7qXH9RGoLm+0tPUPGOPTFI=;\r
  29         b=zPejJzJ5Wk88z+0lqj8Kgrw/3qzuKI2odnV675wqeK1qhXoGmOIZqTeEzhwT0b1Hp4\r
  30         qpsbejnZ8wFjK3sfsgfj0UEmuArRKfnQ/mHMG1z9qHRy9bF1e7CDs3ozp5eYxPWeEL2l\r
  31         AuIJdr82Q6BVRHJeMTqoFoOYdE30glU6r4LaZf73FtaL9N4Qnc6t2/dHKFmjwdNvKefi\r
  32         1Ik27ENz91YOPNFJf1Nr8L8CIuAF26zK/IquUCCb+dFAgkVyQCXyUOZg4hw6zm15xDhs\r
  33         aNgdWDmBnAcU4mGw3vA8Qyq/2erONeMKfC1wEZZkO8DsIFUrN/kYzAtk069DP2Qh/Z8b\r
  34         NpGQ==\r
  35 X-Received: by 10.194.250.6 with SMTP id yy6mr18638881wjc.13.1379255714641;\r
  36         Sun, 15 Sep 2013 07:35:14 -0700 (PDT)\r
  37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
  38         by mx.google.com with ESMTPSA id\r
  39         ey4sm16891988wic.11.1969.12.31.16.00.00\r
  40         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  41         Sun, 15 Sep 2013 07:35:14 -0700 (PDT)\r
  42 From: Mark Walters <markwalters1009@gmail.com>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 2/3] contrib: pick: use the new notmuch-common-keymap for pick\r
  45         entry\r
  46 Date: Sun, 15 Sep 2013 15:35:05 +0100\r
  47 Message-Id: <1379255706-2418-3-git-send-email-markwalters1009@gmail.com>\r
  48 X-Mailer: git-send-email 1.7.9.1\r
  49 In-Reply-To: <1379255706-2418-1-git-send-email-markwalters1009@gmail.com>\r
  50 References: <1379255706-2418-1-git-send-email-markwalters1009@gmail.com>\r
  51 X-BeenThere: notmuch@notmuchmail.org\r
  52 X-Mailman-Version: 2.1.13\r
  53 Precedence: list\r
  54 List-Id: "Use and development of the notmuch mail system."\r
  55         <notmuch.notmuchmail.org>\r
  56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  57         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  59 List-Post: <mailto:notmuch@notmuchmail.org>\r
  60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  63 X-List-Received-Date: Sun, 15 Sep 2013 14:35:24 -0000\r
  64 \r
  65 Austin recently added a global keymap: use this for pick\r
  66 entry.\r
  67 ---\r
  68  contrib/notmuch-pick/notmuch-pick.el |    4 +---\r
  69  1 files changed, 1 insertions(+), 3 deletions(-)\r
  70 \r
  71 diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
  72 index 2deee42..386fef5 100644\r
  73 --- a/contrib/notmuch-pick/notmuch-pick.el\r
  74 +++ b/contrib/notmuch-pick/notmuch-pick.el\r
  75 @@ -966,11 +966,9 @@ The arguments are:\r
  76  \r
  77  \r
  78  ;; Set up key bindings from the rest of notmuch.\r
  79 -(define-key notmuch-search-mode-map "z" 'notmuch-pick)\r
  80 +(define-key notmuch-common-keymap "z" 'notmuch-pick)\r
  81  (define-key notmuch-search-mode-map "Z" 'notmuch-pick-from-search-current-query)\r
  82  (define-key notmuch-search-mode-map (kbd "M-RET") 'notmuch-pick-from-search-thread)\r
  83 -(define-key notmuch-hello-mode-map "z" 'notmuch-pick-from-hello)\r
  84 -(define-key notmuch-show-mode-map "z" 'notmuch-pick)\r
  85  (define-key notmuch-show-mode-map "Z" 'notmuch-pick-from-show-current-query)\r
  86  (notmuch-pick-setup-show-out)\r
  87  (message "Initialised notmuch-pick")\r
  88 -- \r
  89 1.7.9.1\r
  90 \r