From 862134d9cf57e23fb0cee0cee8141d97ce90deb8 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 15 Sep 2013 15:35:05 +0100 Subject: [PATCH] [PATCH 2/3] contrib: pick: use the new notmuch-common-keymap for pick entry --- 33/89a9814649b6adfd144a5d879ce7da22b7a1fa | 90 +++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 33/89a9814649b6adfd144a5d879ce7da22b7a1fa diff --git a/33/89a9814649b6adfd144a5d879ce7da22b7a1fa b/33/89a9814649b6adfd144a5d879ce7da22b7a1fa new file mode 100644 index 000000000..96b845ffa --- /dev/null +++ b/33/89a9814649b6adfd144a5d879ce7da22b7a1fa @@ -0,0 +1,90 @@ +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 C6478431FAF + for ; Sun, 15 Sep 2013 07:35:23 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] 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 XN0-LWi5Igo5 for ; + Sun, 15 Sep 2013 07:35:18 -0700 (PDT) +Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com + [74.125.82.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + AF8DD431FBD for ; Sun, 15 Sep 2013 07:35:15 -0700 + (PDT) +Received: by mail-wg0-f53.google.com with SMTP id x12so2784383wgg.20 + for ; Sun, 15 Sep 2013 07:35:14 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=3QHcwDOBWhJS3LxzIvtNr7qXH9RGoLm+0tPUPGOPTFI=; + b=zPejJzJ5Wk88z+0lqj8Kgrw/3qzuKI2odnV675wqeK1qhXoGmOIZqTeEzhwT0b1Hp4 + qpsbejnZ8wFjK3sfsgfj0UEmuArRKfnQ/mHMG1z9qHRy9bF1e7CDs3ozp5eYxPWeEL2l + AuIJdr82Q6BVRHJeMTqoFoOYdE30glU6r4LaZf73FtaL9N4Qnc6t2/dHKFmjwdNvKefi + 1Ik27ENz91YOPNFJf1Nr8L8CIuAF26zK/IquUCCb+dFAgkVyQCXyUOZg4hw6zm15xDhs + aNgdWDmBnAcU4mGw3vA8Qyq/2erONeMKfC1wEZZkO8DsIFUrN/kYzAtk069DP2Qh/Z8b + NpGQ== +X-Received: by 10.194.250.6 with SMTP id yy6mr18638881wjc.13.1379255714641; + Sun, 15 Sep 2013 07:35:14 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id + ey4sm16891988wic.11.1969.12.31.16.00.00 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sun, 15 Sep 2013 07:35:14 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 2/3] contrib: pick: use the new notmuch-common-keymap for pick + entry +Date: Sun, 15 Sep 2013 15:35:05 +0100 +Message-Id: <1379255706-2418-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1379255706-2418-1-git-send-email-markwalters1009@gmail.com> +References: <1379255706-2418-1-git-send-email-markwalters1009@gmail.com> +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 14:35:24 -0000 + +Austin recently added a global keymap: use this for pick +entry. +--- + contrib/notmuch-pick/notmuch-pick.el | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el +index 2deee42..386fef5 100644 +--- a/contrib/notmuch-pick/notmuch-pick.el ++++ b/contrib/notmuch-pick/notmuch-pick.el +@@ -966,11 +966,9 @@ The arguments are: + + + ;; Set up key bindings from the rest of notmuch. +-(define-key notmuch-search-mode-map "z" 'notmuch-pick) ++(define-key notmuch-common-keymap "z" 'notmuch-pick) + (define-key notmuch-search-mode-map "Z" 'notmuch-pick-from-search-current-query) + (define-key notmuch-search-mode-map (kbd "M-RET") 'notmuch-pick-from-search-thread) +-(define-key notmuch-hello-mode-map "z" 'notmuch-pick-from-hello) +-(define-key notmuch-show-mode-map "z" 'notmuch-pick) + (define-key notmuch-show-mode-map "Z" 'notmuch-pick-from-show-current-query) + (notmuch-pick-setup-show-out) + (message "Initialised notmuch-pick") +-- +1.7.9.1 + -- 2.26.2