emacs: Allow headers to be shown by default in show mode

[notmuch] / emacs / notmuch-show.el

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 53af301a93d623ffc44b633f98ab369edf7d5a06..85e03e89052f864f30dda52badb1fdac1ec6c39e 100644 (file)
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -42,6 +42,11 @@
 that if this order is changed the headers shown when a message is
 collapsed will change.")
 
+(defcustom notmuch-show-headers-visible nil
+  "Should the headers be visible by default?"
+  :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'.")
@@ -416,8 +421,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-show-headers-visible)
 
     ;; Message visibility depends on whether it matched the search
     ;; criteria.
@@ -470,8 +475,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 +531,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 +912,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)