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 F174A431FBC for ; Mon, 23 Jul 2012 10:57:43 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 2.7 X-Spam-Level: ** X-Spam-Status: No, score=2.7 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, FREEMAIL_REPLY=2.499, 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 L3JPuBfKUMfa for ; Mon, 23 Jul 2012 10:57:43 -0700 (PDT) Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 6338A431FAE for ; Mon, 23 Jul 2012 10:57:43 -0700 (PDT) Received: by wgbds1 with SMTP id ds1so3000676wgb.2 for ; Mon, 23 Jul 2012 10:57:42 -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; bh=DoCi997BuHKcW+J4fOEA8wToLBmbjb9s3KymHgq4ajM=; b=ofz11ymj7j+ByGn38iEwbmZWDjrBLS3jUxkckJKWL8h1zBbl1yiAq+kJ7FZwC3EV17 t84YhC7L5NK/DdJ8W0XFoWXUKiwXnZuFNT1Jp/Ji4Hun5faBEOomNYqdtFaHm3HpijTt QPIaLy4V+pbkzr/FkR/9/X+5jaFyf79u76XMzU2hVhuQC5SWNp1dILxn81WCf/P63bdj doFw0m+g4oh2fmapjqB9l1lc5IVyVLUMT0Mp0ZJivGGOCxJeiJR5rofMjkSB3wfgR5st JHH5rshPZiLUJoBOCPz4WnD+rN2tJEjgwMjSyZxJt7a5fz1Z95XlxPk5MGDGcrcO0/9N obKQ== Received: by 10.216.237.149 with SMTP id y21mr8911241weq.102.1343066261849; Mon, 23 Jul 2012 10:57:41 -0700 (PDT) Received: from localhost (94-192-233-223.zone6.bethere.co.uk. [94.192.233.223]) by mx.google.com with ESMTPS id df4sm18012882wib.4.2012.07.23.10.57.40 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Jul 2012 10:57:40 -0700 (PDT) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH v2 0/4] Add a --body option to notmuch show Date: Mon, 23 Jul 2012 18:57:35 +0100 Message-Id: <1343066259-22523-1-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 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: Mon, 23 Jul 2012 17:57:44 -0000 Version 2 of this patch set (version 1 at id:"1343060241-18283-1-git-send-email-markwalters1009@gmail.com"). This corrects the errors Austin spotted in v1, and makes it explicit that --body=false and --part>0 are incompatible. Mark Walters (4): cli: add --body=true|false option to notmuch-show.c test: add tests for the new --body=true|false option man: update man page for the new --body=true|false option schemata: update for --body=true|false option devel/schemata | 2 +- man/man1/notmuch-show.1 | 16 ++++++++++++++++ notmuch-client.h | 3 ++- notmuch-reply.c | 2 +- notmuch-show.c | 30 ++++++++++++++++++++++-------- test/json | 9 +++++++++ 6 files changed, 51 insertions(+), 11 deletions(-) -- 1.7.9.1