Revert "emacs: Add more functions to clean up text/plain parts"

[notmuch] / emacs / notmuch-show.el

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 57111bab6f6df5fd8347c0b6ddd6bcbb65410b0b..f9d6c93edee6aef03d3c40657343e32283522c60 100644 (file)
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -37,19 +37,30 @@
 (declare-function notmuch-select-tag-with-completion "notmuch" (prompt &rest search-terms))
 (declare-function notmuch-search-show-thread "notmuch" nil)
 
-(defvar notmuch-show-headers '("Subject" "To" "Cc" "From" "Date")
-  "Headers that should be shown in a message, in this order. Note
-that if this order is changed the headers shown when a message is
-collapsed will change.")
+(defcustom notmuch-message-headers '("Subject" "To" "Cc" "Date")
+  "Headers that should be shown in a message, in this order.
 
-(defcustom notmuch-show-headers-visible t
-  "Should the headers be visible by default?"
+For an open message, all of these headers will be made visible
+according to `notmuch-message-headers-visible' or can be toggled
+with `notmuch-show-toggle-headers'. For a closed message, only
+the first header in the list will be visible."
+  :group 'notmuch
+  :type '(repeat string))
+
+(defcustom notmuch-message-headers-visible t
+  "Should the headers be visible by default?
+
+If this value is non-nil, then all of the headers defined in
+`notmuch-message-headers' will be visible by default in the display
+of each message. Otherwise, these headers will be hidden and
+`notmuch-show-toggle-headers' can be used to make the visible for
+any given message."
   :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-show-headers'.")
+`notmuch-message-headers'.")
 
 (defvar notmuch-show-hook '(notmuch-show-pretty-hook)
   "A list of functions called after populating a
@@ -203,7 +214,7 @@ message at DEPTH in the current thread."
               (if (and header-value
                        (not (string-equal "" header-value)))
                   (notmuch-show-insert-header header header-value))))
-         notmuch-show-headers)
+         notmuch-message-headers)
     (save-excursion
       (save-restriction
        (narrow-to-region start (point-max))
@@ -371,6 +382,22 @@ current buffer, if possible."
        (headers-invis-spec (notmuch-show-make-symbol "header"))
        (message-invis-spec (notmuch-show-make-symbol "message")))
 
+    ;; Set `buffer-invisibility-spec' to `nil' (a list), otherwise
+    ;; removing items from `buffer-invisibility-spec' (which is what
+    ;; `notmuch-show-headers-visible' and
+    ;; `notmuch-show-message-visible' do) is a no-op and has no
+    ;; effect. This caused threads with only matching messages to have
+    ;; those messages hidden initially because
+    ;; `buffer-invisibility-spec' stayed `t'.
+    ;;
+    ;; This needs to be set here (rather than just above the call to
+    ;; `notmuch-show-headers-visible') because some of the part
+    ;; rendering or body washing functions
+    ;; (e.g. `notmuch-wash-text/plain-citations') manipulate
+    ;; `buffer-invisibility-spec').
+    (when (eq buffer-invisibility-spec t)
+      (setq buffer-invisibility-spec nil))
+
     (setq message-start (point-marker))
 
     (notmuch-show-insert-headerline headers
@@ -422,7 +449,7 @@ current buffer, if possible."
     (notmuch-show-set-message-properties msg)
 
     ;; Set header visibility.
-    (notmuch-show-headers-visible msg notmuch-show-headers-visible)
+    (notmuch-show-headers-visible msg notmuch-message-headers-visible)
 
     ;; Message visibility depends on whether it matched the search
     ;; criteria.