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 907E5431FDB
\r
6 for <notmuch@notmuchmail.org>; Sun, 18 Aug 2013 05:14:56 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\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 XYsMAz3I8O+K for <notmuch@notmuchmail.org>;
\r
18 Sun, 18 Aug 2013 05:14:52 -0700 (PDT)
\r
19 Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com
\r
20 [74.125.82.47]) (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 8F5BD431FD2 for <notmuch@notmuchmail.org>; Sun, 18 Aug 2013 05:14:48 -0700
\r
24 Received: by mail-wg0-f47.google.com with SMTP id j13so2649067wgh.2
\r
25 for <notmuch@notmuchmail.org>; Sun, 18 Aug 2013 05:14:47 -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=BPSCCiYgr5Y5KY76ki/xB+8QNp6X2uXe6tdA1F0/v+4=;
\r
29 b=XWxEbpoEghmNefyyfVAEq7/vU9pbqJ1RUX4fjh4vhfP9OE7dwft3ZK3FFpQvAa0z4P
\r
30 DH0epl4siypzSeN8gloLdJ9ignYml4dc9M4HHEbYasMPEbxMza6FhSURUnkAEh7BjbTH
\r
31 IIzKw5WOkeTJ5pYJDAqns9ORdkXzwBQizWxqgI0+e0/vEIxbLzCjspGDLpCZAsPYmABm
\r
32 Bxn9iDO867OYLic+DEMHL/DcW+FW3C33HhILCheXcREnXOC/Vq3woaJGAnAFqwYJn6pR
\r
33 aBFfRqpm7gGAUzoEPt7YIh41xSU7PC6gXixWVrVBKf3421B4qO0RYKl8tKTeS969m+Kw
\r
35 X-Received: by 10.180.89.101 with SMTP id bn5mr4532011wib.39.1376828087510;
\r
36 Sun, 18 Aug 2013 05:14:47 -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 v9sm9277608wiw.8.1969.12.31.16.00.00
\r
39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
40 Sun, 18 Aug 2013 05:14:47 -0700 (PDT)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v2 02/11] contrib: pick: Link in notmuch-show-pipe-message
\r
44 Date: Sun, 18 Aug 2013 13:14:30 +0100
\r
45 Message-Id: <1376828079-21455-3-git-send-email-markwalters1009@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.9.1
\r
47 In-Reply-To: <1376828079-21455-1-git-send-email-markwalters1009@gmail.com>
\r
48 References: <1376828079-21455-1-git-send-email-markwalters1009@gmail.com>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Sun, 18 Aug 2013 12:14:56 -0000
\r
63 Since we can now use show functions directly in pick we can drop pick-pipe-message.
\r
65 contrib/notmuch-pick/notmuch-pick.el | 31 ++-----------------------------
\r
66 1 files changed, 2 insertions(+), 29 deletions(-)
\r
68 diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
\r
69 index 04e37ee..22ade72 100644
\r
70 --- a/contrib/notmuch-pick/notmuch-pick.el
\r
71 +++ b/contrib/notmuch-pick/notmuch-pick.el
\r
72 @@ -190,6 +190,8 @@ if the user has loaded a different buffer in that window.")
\r
73 (defvar notmuch-pick-mode-map
\r
74 (let ((map (make-sparse-keymap)))
\r
75 (define-key map [mouse-1] 'notmuch-pick-show-message)
\r
76 + ;; these use notmuch-show functions directly
\r
77 + (define-key map "|" 'notmuch-show-pipe-message)
\r
78 (define-key map "q" 'notmuch-pick-quit)
\r
79 (define-key map "x" 'notmuch-pick-quit)
\r
80 (define-key map "?" 'notmuch-help)
\r
81 @@ -205,7 +207,6 @@ if the user has loaded a different buffer in that window.")
\r
82 (define-key map "p" 'notmuch-pick-prev-matching-message)
\r
83 (define-key map "N" 'notmuch-pick-next-message)
\r
84 (define-key map "P" 'notmuch-pick-prev-message)
\r
85 - (define-key map "|" 'notmuch-pick-pipe-message)
\r
86 (define-key map "-" 'notmuch-pick-remove-tag)
\r
87 (define-key map "+" 'notmuch-pick-add-tag)
\r
88 (define-key map " " 'notmuch-pick-scroll-or-next)
\r
89 @@ -586,34 +587,6 @@ message will be \"unarchived\", i.e. the tag changes in
\r
90 (notmuch-pick-close-message-window)
\r
91 (notmuch-mua-new-reply (notmuch-pick-get-message-id) prompt-for-sender nil))
\r
93 -;; Shamelessly stolen from notmuch-show.el: maybe should be unified.
\r
94 -(defun notmuch-pick-pipe-message (command)
\r
95 - "Pipe the contents of the current message to the given command.
\r
97 -The given command will be executed with the raw contents of the
\r
98 -current email message as stdin. Anything printed by the command
\r
99 -to stdout or stderr will appear in the *notmuch-pipe* buffer.
\r
101 -When invoked with a prefix argument, the command will receive all
\r
102 -open messages in the current thread (formatted as an mbox) rather
\r
103 -than only the current message."
\r
104 - (interactive "sPipe message to command: ")
\r
105 - (let ((shell-command
\r
106 - (concat notmuch-command " show --format=raw "
\r
107 - (shell-quote-argument (notmuch-pick-get-message-id)) " | " command))
\r
108 - (buf (get-buffer-create (concat "*notmuch-pipe*"))))
\r
109 - (with-current-buffer buf
\r
110 - (setq buffer-read-only nil)
\r
112 - (let ((exit-code (call-process-shell-command shell-command nil buf)))
\r
113 - (goto-char (point-max))
\r
114 - (set-buffer-modified-p nil)
\r
115 - (setq buffer-read-only t)
\r
116 - (unless (zerop exit-code)
\r
117 - (switch-to-buffer-other-window buf)
\r
118 - (message (format "Command '%s' exited abnormally with code %d"
\r
119 - shell-command exit-code)))))))
\r
121 (defun notmuch-pick-clean-address (address)
\r
122 "Try to clean a single email ADDRESS for display. Return
\r
123 AUTHOR_NAME if present, otherwise return AUTHOR_EMAIL. Return
\r