Emacs: Indent first header line only when indentation is turned on

Previously in message-show mode message's first header line (From
header) was always indented, even if user had turned thread
indentation off with "<" (notmuch-show-toggle-thread-indentation)
command.

This change modifies notmuch-show-insert-headerline function so that
it doesn't indent the first header line if notmuch-show-indent-content
variable is nil.

This change also modifies tests so that they expect this new output
format:
test/emacs-show.expected-output/notmuch-show-indent-thread-content-off
This commit is contained in:
Teemu Likonen 2020-08-15 09:28:29 +03:00 committed by David Bremner
parent 0d4a3c7185
commit adb90b9bb6
2 changed files with 10 additions and 7 deletions

View file

@ -468,7 +468,10 @@ message at DEPTH in the current thread."
;; invisible U+200E LEFT-TO-RIGHT MARK character which forces ;; invisible U+200E LEFT-TO-RIGHT MARK character which forces
;; the header paragraph as left-to-right text. ;; the header paragraph as left-to-right text.
(insert (propertize (string ?\x200e) 'invisible t))) (insert (propertize (string ?\x200e) 'invisible t)))
(insert (notmuch-show-spaces-n (* notmuch-show-indent-messages-width depth)) (insert (if notmuch-show-indent-content
(notmuch-show-spaces-n (* notmuch-show-indent-messages-width
depth))
"")
from from
" (" " ("
date date

View file

@ -31,8 +31,8 @@ Cheers,
[ application/pgp-signature ] [ application/pgp-signature ]
[ text/plain ] [ text/plain ]
[ 4-line signature. Click/Enter to show. ] [ 4-line signature. Click/Enter to show. ]
Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unread) Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unread)
Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed) Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed)
Subject: Re: [notmuch] Working with Maildir storage? Subject: Re: [notmuch] Working with Maildir storage?
To: Mikhail Gusarov <dottedmag@dottedmag.net> To: Mikhail Gusarov <dottedmag@dottedmag.net>
Cc: notmuch@notmuchmail.org Cc: notmuch@notmuchmail.org
@ -57,9 +57,9 @@ It doesn't look like the patch is in git yet.
[ application/pgp-signature ] [ application/pgp-signature ]
[ text/plain ] [ text/plain ]
[ 4-line signature. Click/Enter to show. ] [ 4-line signature. Click/Enter to show. ]
Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox unread) Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox unread)
Keith Packard <keithp@keithp.com> (2009-11-17) (inbox unread) Keith Packard <keithp@keithp.com> (2009-11-17) (inbox unread)
Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-18) (inbox signed unread) Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-18) (inbox signed unread)
Subject: Re: [notmuch] Working with Maildir storage? Subject: Re: [notmuch] Working with Maildir storage?
To: Keith Packard <keithp@keithp.com> To: Keith Packard <keithp@keithp.com>
Cc: notmuch@notmuchmail.org Cc: notmuch@notmuchmail.org
@ -79,4 +79,4 @@ missing "#include <stdint.h>" (for the uint32_t on line 466).
[ application/pgp-signature ] [ application/pgp-signature ]
[ text/plain ] [ text/plain ]
[ 4-line signature. Click/Enter to show. ] [ 4-line signature. Click/Enter to show. ]
Carl Worth <cworth@cworth.org> (2009-11-18) (inbox unread) Carl Worth <cworth@cworth.org> (2009-11-18) (inbox unread)