diff options
| -rw-r--r-- | emacs/notmuch-show.el | 16 | ||||
| -rw-r--r-- | test/emacs.expected-output/notmuch-show-thread-with-hidden-messages | 1 |
2 files changed, 3 insertions, 14 deletions
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 66857177..f96743b0 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -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)) diff --git a/test/emacs.expected-output/notmuch-show-thread-with-hidden-messages b/test/emacs.expected-output/notmuch-show-thread-with-hidden-messages index 5df66063..8a0660fa 100644 --- a/test/emacs.expected-output/notmuch-show-thread-with-hidden-messages +++ b/test/emacs.expected-output/notmuch-show-thread-with-hidden-messages @@ -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) |