From 9158e21094c21bbb58fc45734249a43c75fa3575 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Tue, 24 Jul 2012 22:21:47 +0100 Subject: [PATCH] [PATCH 1/5] emacs: compile and load notmuch-pick.el if present. --- 2f/8954d36d391c1925e71f2c28bd9230bc905392 | 112 ++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 2f/8954d36d391c1925e71f2c28bd9230bc905392 diff --git a/2f/8954d36d391c1925e71f2c28bd9230bc905392 b/2f/8954d36d391c1925e71f2c28bd9230bc905392 new file mode 100644 index 000000000..6b7cbdd12 --- /dev/null +++ b/2f/8954d36d391c1925e71f2c28bd9230bc905392 @@ -0,0 +1,112 @@ +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 B45D6431FAE + for ; Tue, 24 Jul 2012 14:22:03 -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 XMu1l0Kp+4-3 for ; + Tue, 24 Jul 2012 14:22:01 -0700 (PDT) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 1E310431FAF + for ; Tue, 24 Jul 2012 14:22:00 -0700 (PDT) +Received: by weyt57 with SMTP id t57so20631wey.26 + for ; Tue, 24 Jul 2012 14:21:59 -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:x-mailer:in-reply-to:references; + bh=dUSBwykY4Xlbs1LiDF1J6TxOq0a+qgzyt3fkoEvrzlY=; + b=KDY8VBUzOFN1QDj7BTxz+0o+ILPhxUC1RtmzjuGdzvQtvqCT8nHWsxw6fFkQ+ItWFq + RZF1KdOKIaql8/dutoIKGQLfa92iw7GytxAQ1C8eyPufQMstmyZxsDI3I2f0i4DFn+V6 + R6G3/DbQ4CJGd3cThvG47VsNdnJA6ph36rEM+9ygCXxLA1u2A1MrF5ylquytZ4AsqpQi + 1rmS77i4s+mqFs0DK9087EAyP3immjH5lykISY2XVw5fX562s/qcMKYjFIvBh+QFxgdd + p2AOJvl+pTtRKrJG4qZspG3z9/bkuCF1d/uLInhv/GVlmD/lgaaKqpBFyATC5/Z0AcY9 + bz5Q== +Received: by 10.216.242.196 with SMTP id i46mr3363571wer.123.1343164919731; + Tue, 24 Jul 2012 14:21:59 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + ef5sm9675874wib.3.2012.07.24.14.21.58 (version=TLSv1/SSLv3 cipher=OTHER); + Tue, 24 Jul 2012 14:21:58 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 1/5] emacs: compile and load notmuch-pick.el if present. +Date: Tue, 24 Jul 2012 22:21:47 +0100 +Message-Id: <1343164911-31589-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1343164911-31589-1-git-send-email-markwalters1009@gmail.com> +References: <1343164911-31589-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: Tue, 24 Jul 2012 21:22:04 -0000 + +Compile and load notmuch-pick.el if present. + +All the actual setup of pick is done in the function notmuch-pick-init +so we call that in the notmuch init function if it is bound. This +function will setup all extra keybinding etc. +--- + emacs/Makefile.local | 3 ++- + emacs/notmuch.el | 5 +++++ + 2 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/emacs/Makefile.local b/emacs/Makefile.local +index fb82247..9f4dba6 100644 +--- a/emacs/Makefile.local ++++ b/emacs/Makefile.local +@@ -15,7 +15,8 @@ emacs_sources := \ + $(dir)/notmuch-crypto.el \ + $(dir)/notmuch-tag.el \ + $(dir)/coolj.el \ +- $(dir)/notmuch-print.el ++ $(dir)/notmuch-print.el \ ++ $(wildcard $(dir)/notmuch-pick.el) + + emacs_images := \ + $(srcdir)/$(dir)/notmuch-logo.png +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index fd1836f..4f3da4f 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -59,6 +59,9 @@ + (require 'notmuch-maildir-fcc) + (require 'notmuch-message) + ++;; Load notmuch-pick if available (but do not error if not present). ++(load "notmuch-pick" t) ++ + (defcustom notmuch-search-result-format + `(("date" . "%12s ") + ("count" . "%-7s ") +@@ -1088,6 +1091,8 @@ current search results AND that are tagged with the given tag." + (defun notmuch () + "Run notmuch and display saved searches, known tags, etc." + (interactive) ++ (when (fboundp 'notmuch-pick-init) ++ (notmuch-pick-init)) + (notmuch-hello)) + + (defun notmuch-interesting-buffer (b) +-- +1.7.9.1 + -- 2.26.2