[PATCH v3 02/11] contrib: pick: Link in notmuch-show-pipe-message
authorMark Walters <markwalters1009@gmail.com>
Thu, 22 Aug 2013 17:10:17 +0000 (18:10 +0100)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 17:56:32 +0000 (09:56 -0800)
c9/f1418520bfff2097ec2c584343681fe5bb891f [new file with mode: 0644]

diff --git a/c9/f1418520bfff2097ec2c584343681fe5bb891f b/c9/f1418520bfff2097ec2c584343681fe5bb891f
new file mode 100644 (file)
index 0000000..3bda7cc
--- /dev/null
@@ -0,0 +1,126 @@
+Return-Path: <markwalters1009@gmail.com>\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 A3DC6429E38\r
+       for <notmuch@notmuchmail.org>; Thu, 22 Aug 2013 10:10:42 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] 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 h6GyCUJUicDD for <notmuch@notmuchmail.org>;\r
+       Thu, 22 Aug 2013 10:10:37 -0700 (PDT)\r
+Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com\r
+ [74.125.82.54])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ C8F50431FC9   for <notmuch@notmuchmail.org>; Thu, 22 Aug 2013 10:10:35 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f54.google.com with SMTP id e12so1919595wgh.9\r
+       for <notmuch@notmuchmail.org>; Thu, 22 Aug 2013 10:10:34 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=BPSCCiYgr5Y5KY76ki/xB+8QNp6X2uXe6tdA1F0/v+4=;\r
+       b=tKNkuqWtd1S0MAMtxkbongy2SzT7iG4kcCswy6lFz94VnJG6ykePHmeGaMwRA7G+XX\r
+       CRZFbVu2vM3RmRIG1gupVYM6nLT1oFSOanu8Y8kVXmlunAJSbAbzU5WfXAFJEzEz2EyA\r
+       Jo1MajbnUmwySf9qkTgrkUy04Xcydp/SbfqJ3jdeQJXH6Tk3bjdkEMGYZ8cmX0GriMhn\r
+       honochsC7QcVH5zT4Er1vaphya674ZMUdOETiy8FR8gNVVCdwFlZ53DnqqkbDf5am8TD\r
+       irDQTqIMIBh/XRyD/CJY4IA9Ebd4i97SV/tWo4GXmyyD8hy4o4UGEuYIyVwjQ/0wZ7hI\r
+       cOKg==\r
+X-Received: by 10.194.87.36 with SMTP id u4mr2327258wjz.64.1377191434710;\r
+       Thu, 22 Aug 2013 10:10:34 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id li9sm18222127wic.4.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Thu, 22 Aug 2013 10:10:34 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 02/11] contrib: pick: Link in notmuch-show-pipe-message\r
+Date: Thu, 22 Aug 2013 18:10:17 +0100\r
+Message-Id: <1377191427-6821-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1377191427-6821-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1377191427-6821-1-git-send-email-markwalters1009@gmail.com>\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: Thu, 22 Aug 2013 17:10:42 -0000\r
+\r
+Since we can now use show functions directly in pick we can drop pick-pipe-message.\r
+---\r
+ contrib/notmuch-pick/notmuch-pick.el |   31 ++-----------------------------\r
+ 1 files changed, 2 insertions(+), 29 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 04e37ee..22ade72 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -190,6 +190,8 @@ if the user has loaded a different buffer in that window.")\r
+ (defvar notmuch-pick-mode-map\r
+   (let ((map (make-sparse-keymap)))\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
+     (define-key map "q" 'notmuch-pick-quit)\r
+     (define-key map "x" 'notmuch-pick-quit)\r
+     (define-key map "?" 'notmuch-help)\r
+@@ -205,7 +207,6 @@ if the user has loaded a different buffer in that window.")\r
+     (define-key map "p" 'notmuch-pick-prev-matching-message)\r
+     (define-key map "N" 'notmuch-pick-next-message)\r
+     (define-key map "P" 'notmuch-pick-prev-message)\r
+-    (define-key map "|" 'notmuch-pick-pipe-message)\r
+     (define-key map "-" 'notmuch-pick-remove-tag)\r
+     (define-key map "+" 'notmuch-pick-add-tag)\r
+     (define-key map " " 'notmuch-pick-scroll-or-next)\r
+@@ -586,34 +587,6 @@ message will be \"unarchived\", i.e. the tag changes in\r
+   (notmuch-pick-close-message-window)\r
+   (notmuch-mua-new-reply (notmuch-pick-get-message-id) prompt-for-sender nil))\r
\r
+-;; Shamelessly stolen from notmuch-show.el: maybe should be unified.\r
+-(defun notmuch-pick-pipe-message (command)\r
+-  "Pipe the contents of the current message to the given command.\r
+-\r
+-The given command will be executed with the raw contents of the\r
+-current email message as stdin. Anything printed by the command\r
+-to stdout or stderr will appear in the *notmuch-pipe* buffer.\r
+-\r
+-When invoked with a prefix argument, the command will receive all\r
+-open messages in the current thread (formatted as an mbox) rather\r
+-than only the current message."\r
+-  (interactive "sPipe message to command: ")\r
+-  (let ((shell-command\r
+-       (concat notmuch-command " show --format=raw "\r
+-               (shell-quote-argument (notmuch-pick-get-message-id)) " | " command))\r
+-       (buf (get-buffer-create (concat "*notmuch-pipe*"))))\r
+-    (with-current-buffer buf\r
+-      (setq buffer-read-only nil)\r
+-      (erase-buffer)\r
+-      (let ((exit-code (call-process-shell-command shell-command nil buf)))\r
+-      (goto-char (point-max))\r
+-      (set-buffer-modified-p nil)\r
+-      (setq buffer-read-only t)\r
+-      (unless (zerop exit-code)\r
+-        (switch-to-buffer-other-window buf)\r
+-        (message (format "Command '%s' exited abnormally with code %d"\r
+-                         shell-command exit-code)))))))\r
+-\r
+ (defun notmuch-pick-clean-address (address)\r
+   "Try to clean a single email ADDRESS for display. Return\r
+ AUTHOR_NAME if present, otherwise return AUTHOR_EMAIL. Return\r
+-- \r
+1.7.9.1\r
+\r