X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=452987839270909422d3a6d28e1981a7f27228fa;hb=74d00bb0e847a1aa785b9cae2e8242a7789bf8b3;hp=0d9b52a7f1b29769cffee30e1dbef50e7b0edab5;hpb=52f751fb7442d7fd79e2a7dae5858f23e28e4438;p=notmuch

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 0d9b52a7..45298783 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'.")
@@ -96,7 +85,7 @@ same as that of the previous message."
 	     notmuch-wash-excerpt-citations))
 
 ;; Mostly useful for debugging.
-(defcustom notmuch-show-all-multipart/alternative-parts nil
+(defcustom notmuch-show-all-multipart/alternative-parts t
   "Should all parts of multipart/alternative parts be shown?"
   :group 'notmuch
   :type 'boolean)
@@ -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))