X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=f96743b08d37b597a856ff1a1803f1d325c8c602;hb=8e2a14bbbb5c423614a2f5992d756674ece5bedb;hp=6685717719ee63b58123688a0c87a3b081ca34a5;hpb=432e091924c1d1d8950a44ca78bc5b9c5ade47e4;p=notmuch

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))