emacs: Add `notmuch-show-always-show-subject', allowing control over

the display of collapsed messages.

Signed-off-by: Jameson Rollins <jrollins@finestructure.net>

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index a1cf2d82377ebba3c6108282df3290cf0e3bcd7e..2ce3ebf82a1dceb8f9827c5d3525a4445c9219d1 100644 (file)
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -64,6 +64,11 @@ any given message."
   :group 'notmuch
   :type 'boolean)
 
   :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'.")
 (defvar notmuch-show-markup-headers-hook '(notmuch-show-colour-headers)
   "A list of functions called to decorate the headers listed in
 `notmuch-message-headers'.")


@@ -621,8 +626,9 @@ 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.
       ;; 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 (not (string= notmuch-show-previous-subject
-                         bare-subject))
+      (when (or notmuch-show-always-show-subject
+                (not (string= notmuch-show-previous-subject
+                              bare-subject)))

        (forward-line 1))
       (setq headers-start (point-marker)))
     (setq headers-end (point-marker))
        (forward-line 1))
       (setq headers-start (point-marker)))
     (setq headers-end (point-marker))