From: Felix Geller <fgeller@gmail.com>
To: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>, notmuch@notmuchmail.org
Subject: Re: [PATCH] Emacs: Add variable to toggle message indentation in a
	thread
In-Reply-To: <87mxgl19n3.fsf@gmail.com>
References: <m2r55xi4yr.fsf@gmail.com> <87mxgl19n3.fsf@gmail.com>
User-Agent: Emacs/23.3.1 (x86_64-apple-darwin10.7.0)
Date: Mon, 11 Jul 2011 11:24:57 +0200
Message-ID: <m2aaclkw46.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"
Precedence: list

--=-=-=
Content-Transfer-Encoding: quoted-printable

Hi Dmitry,

thank you for the comments. I included an updated patch that also
includes Daniel's comment regarding the default value.=20

I didn't change the "when" though--not because of personal reasons
;)--but because it is used for determining indentation of multi-parts.


Cheers,
Felix



On Mon, 11 Jul 2011 12:53:04 +0400, Dmitry Kurochkin <dmitry.kurochkin@gmai=
l.com> wrote:
> Hi Felix.
>=20
> On Mon, 11 Jul 2011 10:42:04 +0200, Felix Geller <fgeller@gmail.com> wrot=
e:
> > Hi,
> >=20
> > I added a variable to toggle message indentation in Emacs.
> >=20
> > Please let me know what you think.
> >=20
>=20
> I like the change.  Though I do not think I would use it without
> chronological sorting.
>=20
> Comments on the code below.
>=20
> Regards,
>   Dmitry
>=20
> >=20
> > Cheers,
> > Felix
> >=20
> >=20
> > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
> > index a433dec..8101c27 100644
> > --- a/emacs/notmuch-show.el
> > +++ b/emacs/notmuch-show.el
> > @@ -90,6 +90,11 @@ any given message."
> >    :group 'notmuch
> >    :type 'boolean)
> >=20=20
> > +(defcustom notmuch-show-indent-messages-in-thread nil
> > +  "Should the messages in a thread be indented according to their resp=
ective depth in the thread?"
>=20
> This line is too long and should be split.
>=20
> > +  :group 'notmuch
> > +  :type 'boolean)
> > +
> >  (defcustom notmuch-show-indent-multipart nil
> >    "Should the sub-parts of a multipart/* part be indented?"
> >    ;; dme: Not sure which is a good default.
> > @@ -237,7 +242,9 @@ unchanged ADDRESS if parsing fails."
> >    "Insert a notmuch style headerline based on HEADERS for a
> >  message at DEPTH in the current thread."
> >    (let ((start (point)))
> > -    (insert (notmuch-show-spaces-n depth)
> > +    (insert (if notmuch-show-indent-messages-in-thread
> > +		(notmuch-show-spaces-n depth)
> > +	      "")
>=20
> (if notmuch-show-indent-messages-in-thread
>     (insert (notmuch-show-spaces-n depth)))
>=20
> Is cleaner and avoids useless empty string insert.
>=20
> >  	    (notmuch-show-clean-address (plist-get headers :From))
> >  	    " ("
> >  	    date
> > @@ -733,7 +740,8 @@ current buffer, if possible."
> >      (setq content-end (point-marker))
> >=20=20
> >      ;; Indent according to the depth in the thread.
> > -    (indent-rigidly content-start content-end depth)
> > +    (when notmuch-show-indent-messages-in-thread
> > +      (indent-rigidly content-start content-end depth))
>=20
> Not a big deal, but I would prefer `if' instead of `when' here.
>=20
> Regards,
>   Dmitry
>=20
> >=20=20
> >      (setq message-end (point-max-marker))
> >=20=20
> > _______________________________________________
> > notmuch mailing list
> > notmuch@notmuchmail.org
> > http://notmuchmail.org/mailman/listinfo/notmuch


commit f90fafdc0545a825ea4b69db5e51c2e866a4ff5e
Author: Felix Geller <fgeller@gmail.com>
Date:   Mon Jul 11 10:39:00 2011 +0200

    Added a variable to toggle message indentation for thread view in emacs.
     - includes adjustments according to comments from ML

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index a433dec..1834066 100644
=2D-- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -90,6 +90,11 @@ any given message."
   :group 'notmuch
   :type 'boolean)
=20
+(defcustom notmuch-show-indent-messages-in-thread t
+  "Should messages be indented according to their depth in a thread?"
+  :group 'notmuch
+  :type 'boolean)
+
 (defcustom notmuch-show-indent-multipart nil
   "Should the sub-parts of a multipart/* part be indented?"
   ;; dme: Not sure which is a good default.
@@ -237,8 +242,9 @@ unchanged ADDRESS if parsing fails."
   "Insert a notmuch style headerline based on HEADERS for a
 message at DEPTH in the current thread."
   (let ((start (point)))
=2D    (insert (notmuch-show-spaces-n depth)
=2D	    (notmuch-show-clean-address (plist-get headers :From))
+    (when notmuch-show-indent-messages-in-thread
+      (insert (notmuch-show-spaces-n depth)))
+    (insert (notmuch-show-clean-address (plist-get headers :From))
 	    " ("
 	    date
 	    ") ("
@@ -733,7 +739,8 @@ current buffer, if possible."
     (setq content-end (point-marker))
=20
     ;; Indent according to the depth in the thread.
=2D    (indent-rigidly content-start content-end depth)
+    (when notmuch-show-indent-messages-in-thread
+      (indent-rigidly content-start content-end depth))
=20
     (setq message-end (point-max-marker))
=20

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.17 (Darwin)

iEYEARECAAYFAk4awWkACgkQMxgKfMb9y5b1UQCeIStWr0O4YjIiY9T5FCgfbyGS
Oo4AoNaw+6QUL3j2i/MKLouvWR4XvPaV
=YCfD
-----END PGP SIGNATURE-----
--=-=-=--