diff options
| author | Teemu Likonen <tlikonen@iki.fi> | 2020-08-15 09:28:29 +0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2020-08-15 09:16:34 -0300 |
| commit | adb90b9bb633c82f41a6c04c07f6becc12f332aa (patch) | |
| tree | fa8b766d15c36aa9119d89ea364f1d357ac8d4de | |
| parent | 0d4a3c71850f6440f33b10ebfd2c798611bffdcb (diff) | |
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
| -rw-r--r-- | emacs/notmuch-show.el | 5 | ||||
| -rw-r--r-- | test/emacs-show.expected-output/notmuch-show-indent-thread-content-off | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index b0f2d28b..5015d2ae 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -468,7 +468,10 @@ message at DEPTH in the current thread." ;; invisible U+200E LEFT-TO-RIGHT MARK character which forces ;; the header paragraph as left-to-right text. (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 " (" date diff --git a/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off b/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off index 1a06374d..0bb58330 100644 --- a/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off +++ b/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off @@ -31,8 +31,8 @@ Cheers, [ application/pgp-signature ] [ text/plain ] [ 4-line signature. Click/Enter to show. ] - Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unread) - Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed) +Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unread) +Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed) Subject: Re: [notmuch] Working with Maildir storage? To: Mikhail Gusarov <dottedmag@dottedmag.net> Cc: notmuch@notmuchmail.org @@ -57,9 +57,9 @@ It doesn't look like the patch is in git yet. [ application/pgp-signature ] [ text/plain ] [ 4-line signature. Click/Enter to show. ] - Mikhail Gusarov <dottedmag@dottedmag.net> (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) +Mikhail Gusarov <dottedmag@dottedmag.net> (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) Subject: Re: [notmuch] Working with Maildir storage? To: Keith Packard <keithp@keithp.com> Cc: notmuch@notmuchmail.org @@ -79,4 +79,4 @@ missing "#include <stdint.h>" (for the uint32_t on line 466). [ application/pgp-signature ] [ text/plain ] [ 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) |