debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Fix to unconditionally display subject changes in collapsed thread view

Browse source 
The feature to show subject changes in the collapsed thread view was
originally added (8ab433607) with an option
(notmuch-show-always-show-subject) to display the subject
for all messages, even when there was no change.

The subsequent commit (4f04d273) changed the sense of the test (or to
and) and the name of the controlling variable
(notmuch-show-elide-same-subject).

But this commit is broken in a few ways:

  1. The original definition of notmuch-show-always-show-subject was
     left around

     But the variable isn't actually used in the code at all, so it
     just adds clutter and confusion to the customization interface.

  2. The name and description of the controlling variable doesn't
     match the implementation

     The name suggests that setting the variable to t will cause
     repeated subjects to be elided, (suggesting that when it is nil
     all subjects will be shown).

     However, when the variable is nil, no subjects are shown. So a
     correct name for the variable in this sense would be
     notmuch-show-subject-changes.

Showing subject changes is a useful feature, and should be on by
default. (We don't want to bury generally useful features behind
customizations that users have to find).

Rather than fixing the name of the variable and changing its default
value, here we remove the condition entirely, such that the feature is
enabled unconditionally.

So both the currently-used variable and the stale definition of the
formerly-used are removed.

Also, the one relevant test-suite result is updated, (showing the
intial subject of a collapsed thread, and no subject display for later
messages that do not change the subject).
(cherry picked from commit 580de27177)
This commit is contained in:
Carl Worth 2011-07-01 01:44:39 -07:00 committed by David Bremner
parent 5d53226005
commit 8f9c403131
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
emacs/notmuch-show.el
View file

@ -65,17 +65,6 @@ any given message."
:group 'notmuch
:type 'boolean)
(defcustom notmuch-show-elide-same-subject nil
"Do not show the subject of a collapsed message if it is the
same as that of the previous message."
:group 'notmuch
:type 'boolean)
(defcustom notmuch-show-always-show-subject t
"Should a collapsed message show the `Subject:' line?"
:group 'notmuch
:type 'boolean)
(defvar notmuch-show-markup-headers-hook '(notmuch-show-colour-headers)
"A list of functions called to decorate the headers listed in
`notmuch-message-headers'.")
@ -727,9 +716,8 @@ current buffer, if possible."
;; If the subject of this message is the same as that of the
;; previous message, don't display it when this message is
;; collapsed.
(when (and notmuch-show-elide-same-subject
(not (string= notmuch-show-previous-subject
bare-subject)))
(when (not (string= notmuch-show-previous-subject
bare-subject))
(forward-line 1))
(setq headers-start (point-marker)))
(setq headers-end (point-marker))

1
test/emacs.expected-output/notmuch-show-thread-with-hidden-messages
View file

@ -1,3 +1,4 @@
Jan Janak <jan@ryngle.com> (2009-11-17) (inbox unread)
Subject: [notmuch] What a great idea!
Jan Janak <jan@ryngle.com> (2009-11-17) (inbox)
Carl Worth <cworth@cworth.org> (2009-11-18) (inbox unread)