From: Daniel Schoepe <daniel@schoepe.org>
To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org
Subject: Re: [RFC PATCH v2 1/3] cli: notmuch-show changes to support pick
In-Reply-To: <1329072579-27340-2-git-send-email-markwalters1009@gmail.com>
References: <1329072579-27340-1-git-send-email-markwalters1009@gmail.com>
	<1329072579-27340-2-git-send-email-markwalters1009@gmail.com>
User-Agent: Notmuch/0.11.1+191~gb324ce8 (http://notmuchmail.org)
	Emacs/24.0.93.1 (x86_64-pc-linux-gnu)
Date: Sun, 12 Feb 2012 22:08:23 +0100
Message-ID: <874nuvu5dk.fsf@schoepe.localhost>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"
Precedence: list

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

On Sun, 12 Feb 2012 18:49:37 +0000, Mark Walters <markwalters1009@gmail.com=
> wrote:
> +    int opt_index, ret, entire_thread;
> +    notmuch_sort_t sort =3D NOTMUCH_SORT_NEWEST_FIRST;
>      const notmuch_show_format_t *format =3D &format_text;
>      notmuch_show_params_t params =3D { .part =3D -1 };
>      int format_sel =3D NOTMUCH_FORMAT_NOT_SPECIFIED;
>      notmuch_bool_t verify =3D FALSE;
> +    notmuch_bool_t headers_only =3D FALSE;
>=20=20
>      notmuch_opt_desc_t options[] =3D {
>  	{ NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',
> @@ -1042,10 +1093,19 @@ notmuch_show_command (void *ctx, unused (int argc=
), unused (char *argv[]))
>  				  { "mbox", NOTMUCH_FORMAT_MBOX },
>  				  { "raw", NOTMUCH_FORMAT_RAW },
>  				  { 0, 0 } } },
> +	{ NOTMUCH_OPT_KEYWORD, &sort, "sort", 's',
> +	  (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST },
> +				  { "newest-first", NOTMUCH_SORT_NEWEST_FIRST },
> +				  { 0, 0 } } },
>  	{ NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 },
> -	{ NOTMUCH_OPT_BOOLEAN, &params.entire_thread, "entire-thread", 't', 0 },
> +	{ NOTMUCH_OPT_KEYWORD, &entire_thread, "thread", 't',
> +	  (notmuch_keyword_t []){ { "match", NOTMUCH_SHOW_THREAD_MATCH, },
> +				  { "entire", NOTMUCH_SHOW_THREAD_ENTIRE },
> +				  { "none", NOTMUCH_SHOW_THREAD_NONE },
> +				  { 0, 0 } } },
>  	{ NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 },
>  	{ NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },
> +	{ NOTMUCH_OPT_BOOLEAN, &headers_only, "headers-only", 'h', 0 },
>  	{ 0, 0, 0, 0, 0 }
>      };
>=20=20
> @@ -1055,6 +1115,9 @@ notmuch_show_command (void *ctx, unused (int argc),=
 unused (char *argv[]))
>  	return 1;
>      }
>=20=20
> +    params.entire_thread =3D entire_thread;

entire_thread is not initialized here, if there is no --thread
argument. The rest of the code makes this result in the same behavior as
=2D-thread=3Dentire, but it should be initialized to
NOTMUCH_SHOW_THREAD_MATCH.

Cheers,
Daniel

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBAgAGBQJPOCpHAAoJEIaTAtce+Z+JV2IP/Asg3lM8LpIR4h4Bk66dtQ24
xqs8Qs2vioLAdxzdMgfwyMDuQnarw4LJUuOicVp22cYOI6Asu/oDatvW7La2yWvr
hz/kCkyV5XBGAVkcme+CPfv/cJT7sxwpw49IpFYnCzVGgk8Y61MMWBNF0RkAfwnz
6OgKiTLYZ8KBlJS+5+095cv6uHaK983L3qkRsxT9V51az/gSzOde+MGJSrXI6C2W
eoJ6rKVEjjWUfr2/Oi9F03XrKPiDIxovFPnhDEnQh43RpRveEX6FXfDSv4cCLdC5
t5lF70mnBnvcrwRYz2Guqt0DlYtgNzGYTK/IzaBEIOKecvIWpOLqrR/aMiu4cJQJ
Bcn46NnLJ/2zdODMfVvtNm+jGQ3sbITcBoRyhW7C5H3uMl9ItUTVPTpszUuPct+d
XrBpdbrhoAqwVkpSs3IaGyUKcZrdN+/TKk9zQi9f0b8uYFe7Q0bmk2czha4JQijH
VUrMZGkarUcAro6ZCy+pRdeoD+aTZFaSUvlJnhqCJqWZRuxmPc8waMMFj3RbZzGA
EdEIjQLM4Y99icFSj6524I2GmOKFyX8H8W8UFMnfOx9j/knT7ThjAPPg2awUdRLG
rqASaarAZupzOn/xag4V0hKyvYPPt1ziyZJY3Jd+X0HHV7f80mJX/ewgzMWv4CrF
Z4Rn2rZLDr7+wLOEtubq
=zSj/
-----END PGP SIGNATURE-----
--=-=-=--