X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=aa8041c2cbcdad5a6c24fdf54281a6d7495f202c;hb=d6dea895884cdcb356f774197cdb9f7f8e2b5188;hp=e1d63c4ff66346bbac029ca8bfc5b2d965b936aa;hpb=4d2acc3eca400cd1233ff269532328a4ba1433b5;p=notmuch

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index e1d63c4f..aa8041c2 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -37,21 +37,21 @@
 (declare-function notmuch-select-tag-with-completion "notmuch" (prompt &rest search-terms))
 (declare-function notmuch-search-show-thread "notmuch" nil)
 
-(defcustom notmuch-show-headers '("Subject" "To" "Cc" "From" "Date")
+(defcustom notmuch-message-headers '("Subject" "To" "Cc" "Date")
   "Headers that should be shown in a message, in this order.
 
 For an open message, all of these headers will be made visible
-according to `notmuch-show-headers-visible' or can be toggled
+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-show-headers-visible t
+(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-show-headers' will be visible by default in the display
+`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."
@@ -60,19 +60,36 @@ any given message."
 
 (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)
+(defcustom notmuch-show-hook '(notmuch-show-pretty-hook)
   "A list of functions called after populating a
-`notmuch-show' buffer.")
-
-(defvar notmuch-show-insert-text/plain-hook '(notmuch-wash-text/plain-citations)
-  "A list of functions called to clean up text/plain body parts.")
+`notmuch-show' buffer."
+  :group 'notmuch
+  :type 'hook
+  :options '(notmuch-show-pretty-hook
+	     notmuch-show-turn-off-word-wrap))
+
+(defcustom notmuch-show-insert-text/plain-hook
+  '(notmuch-wash-tidy-citations
+    notmuch-wash-compress-blanks
+    notmuch-wash-markup-citations)
+  "A list of functions called to clean up text/plain body parts."
+  :group 'notmuch
+  :type 'hook
+  :options '(notmuch-wash-wrap-long-lines
+	     notmuch-wash-tidy-citations
+	     notmuch-wash-compress-blanks
+	     notmuch-wash-markup-citations))
 
 (defun notmuch-show-pretty-hook ()
   (goto-address-mode 1)
   (visual-line-mode))
 
+(defun notmuch-show-turn-off-word-wrap ()
+  ;; `toggle-word-wrap' outputs a message, which is distracting.
+  (setq word-wrap nil))
+
 (defmacro with-current-notmuch-show-message (&rest body)
   "Evaluate body with current buffer set to the text of current message"
   `(save-excursion
@@ -214,7 +231,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))
@@ -433,7 +450,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.