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

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 53af301a..aa8041c2 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -37,26 +37,59 @@
 (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.
+
+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)
+(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
@@ -198,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))
@@ -416,8 +449,8 @@ current buffer, if possible."
     ;; the content).
     (notmuch-show-set-message-properties msg)
 
-    ;; Headers are hidden by default.
-    (notmuch-show-headers-visible msg nil)
+    ;; Set header visibility.
+    (notmuch-show-headers-visible msg notmuch-message-headers-visible)
 
     ;; Message visibility depends on whether it matched the search
     ;; criteria.
@@ -470,8 +503,8 @@ function is used. "
     (save-excursion
       (let* ((basic-args (list thread-id))
 	     (args (if query-context
-		       (append (list "\"") basic-args (list "and (" query-context ")\""))
-		     (append (list "\"") basic-args (list "\"")))))
+		       (append (list "\'") basic-args (list "and (" query-context ")\'"))
+		     (append (list "\'") basic-args (list "\'")))))
 	(notmuch-show-insert-forest (notmuch-query-get-threads args))
 	;; If the query context reduced the results to nothing, run
 	;; the basic query.
@@ -526,6 +559,7 @@ function is used. "
 	(define-key map "p" 'notmuch-show-previous-open-message)
 	(define-key map (kbd "DEL") 'notmuch-show-rewind)
 	(define-key map " " 'notmuch-show-advance-and-archive)
+	(define-key map (kbd "M-RET") 'notmuch-show-open-or-close-all)
 	(define-key map (kbd "RET") 'notmuch-show-toggle-message)
 	map)
       "Keymap for \"notmuch show\" buffers.")
@@ -906,6 +940,18 @@ to stdout or stderr will appear in the *Messages* buffer."
      (not (plist-get props :message-visible))))
   (force-window-update))
 
+(defun notmuch-show-open-or-close-all ()
+  "Set the visibility all of the messages in the current thread.
+By default make all of the messages visible. With a prefix
+argument, hide all of the messages."
+  (interactive)
+  (save-excursion
+    (goto-char (point-min))
+    (loop do (notmuch-show-message-visible (notmuch-show-get-message-properties)
+					   (not current-prefix-arg))
+	  until (not (notmuch-show-goto-message-next))))
+  (force-window-update))
+
 (defun notmuch-show-next-button ()
   "Advance point to the next button in the buffer."
   (interactive)