[PATCH v4 0/2] emacs: User-defined sections in notmuch-hello

[Daniel Schoepe]

Fourth time's the charm. Some more improvements by Michal Sojka, thanks.

A few more opinions about whether or not to leave in the different
filters for queries and counts, would also be very much appreciated.

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe]

This patch makes the notmuch-hello screen fully customizable
by allowing the user to add and remove arbitrary sections. It
also provides some convenience functions for constructing sections,
e.g. showing the unread message count for each tag.

This is done by specifying a list of functions that will be run
when notmuch-hello is invoked.
---
 emacs/notmuch-hello.el |  617 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 416 insertions(+), 201 deletions(-)

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 65fde75..434eded 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -70,11 +70,6 @@ should return a filter for that tag, or nil to hide the tag."
  (const :tag "Custom filter function" function))
   :group 'notmuch)
 
-(defcustom notmuch-hello-hide-tags nil
-  "List of tags to be hidden in the \"all tags\"-section."
-  :type '(repeat string)
-  :group 'notmuch)
-
 (defface notmuch-hello-logo-background
   '((((class color)
       (background dark))
@@ -123,6 +118,94 @@ Typically \",\" in the US and UK and \".\" in Europe."
 
 (defvar notmuch-hello-recent-searches nil)
 
+(defvar notmuch-custom-section-options
+  '((:make-query (string :tag "Filter for each tag"))
+    (:make-count (string :tag "Different filter message counts"))
+    (:initially-hidden (boolean :tag "Hide this on startup?"))
+    (:show-empty-searches (boolean :tag "Show queries with no matching messages"))
+    (:hide-if-empty (boolean :tag "Hide if empty")))
+  "Various customization-options for notmuch-hello-tags/query-section.")
+
+(define-widget 'notmuch-hello-tags-section 'lazy
+  "Customize-type for notmuch-hello tag-list sections."
+  :tag "Customized tag-list (see docstring for details)"
+  :type
+  `(list :tag ""
+ (const :tag "" notmuch-hello-insert-tags-section)
+ (string :tag "Title for this section")
+ (plist
+  :inline t
+  :options
+  ,(append notmuch-custom-section-options
+   '((:hide-tags (repeat :tag "Tags that will be hidden"
+ string)))))))
+
+(define-widget 'notmuch-hello-query-section 'lazy
+  "Customize-type for custom saved-search-like sections"
+  :tag "Customized queries section (see docstring for details)"
+  :type
+  `(list :tag ""
+ (const :tag "" notmuch-hello-insert-query-list)
+ (string :tag "Title for this section")
+ (repeat :tag "Queries"
+ (cons (string :tag "Name") (string :tag "Query")))
+ (plist :inline t :options ,notmuch-custom-section-options)))
+
+(defcustom notmuch-hello-sections
+  (list #'notmuch-hello-insert-header
+ #'notmuch-hello-insert-saved-searches
+ #'notmuch-hello-insert-search
+ #'notmuch-hello-insert-recent-searches
+ #'notmuch-hello-insert-alltags
+ #'notmuch-hello-insert-footer)
+  "Sections for notmuch-hello.
+
+Each entry of this list should be a function of no arguments that
+should return if `notmuch-hello-target' is produced as part of its
+output and nil otherwise. For convenience an element can also be
+a list of the form (FUNC ARG1 ARG2 .. ARGN) in which case FUNC
+will be applied to the rest of the list.
+
+The functions will be run to construct the content of the
+notmuch-hello buffer in the order they appear in this list. A
+section should not end with an empty line, because a newline will
+be inserted after each section by `notmuch-hello'.
+
+A \"Customized tag-list\" item in the customize-interface
+displays a list of all tags, optionally hiding some of them. It
+is also possible to filter the list of messages matching each tag
+by an additional filter query. Similarly, the count of messages
+displayed next to the buttons can be generated by applying a
+different filter to the tag query. These filters are also
+supported for \"Customized queries section\" items."
+  :group 'notmuch
+  :type
+  '(repeat
+    (choice (function-item notmuch-hello-insert-header)
+    (function-item notmuch-hello-insert-saved-searches)
+    (function-item notmuch-hello-insert-search)
+    (function-item notmuch-hello-insert-recent-searches)
+    (function-item notmuch-hello-insert-alltags)
+    (function-item notmuch-hello-insert-footer)
+    (function-item notmuch-hello-insert-inbox)
+    notmuch-hello-tags-section
+    notmuch-hello-query-section
+    (function :tag "Custom function"))))
+
+(defvar notmuch-hello-target nil
+  "Button at position of point before rebuilding the notmuch-buffer
+
+This variable contains the string of the button, if any, the
+point was positioned at before the notmuch-hello buffer was
+rebuilt. This is never actually set globally and defined as a
+defvar only for documentation purposes and to avoid a compiler
+warning about it occurring as a free variable.")
+
+(defvar notmuch-hello-hidden-sections nil
+  "List of query section titles whose contents are hidden")
+
+(defvar notmuch-hello-first-run t)
+
 (defun notmuch-hello-remember-search (search)
   (if (not (member search notmuch-hello-recent-searches))
       (push search notmuch-hello-recent-searches))
@@ -173,8 +256,8 @@ Typically \",\" in the US and UK and \".\" in Europe."
     (message "Saved '%s' as '%s'." search name)
     (notmuch-hello-update)))
 
-(defun notmuch-hello-longest-label (tag-alist)
-  (or (loop for elem in tag-alist
+(defun notmuch-hello-longest-label (searches-alist)
+  (or (loop for elem in searches-alist
     maximize (length (car elem)))
       0))
 
@@ -238,12 +321,71 @@ should be. Returns a cons cell `(tags-per-line width)'."
    (* tags-per-line (+ 9 1))))
    tags-per-line))))
 
-(defun notmuch-hello-insert-tags (tag-alist widest target)
-  (let* ((tags-and-width (notmuch-hello-tags-per-line widest))
+(defun notmuch-hello-filtered-query (query filter)
+  "Constructs a query to search all messages matching QUERY and FILTER.
+
+If FILTER is a string, it is directly used in the returned query.
+
+If FILTER is a function, it is called with QUERY as a parameter and
+the string it returns is used as the filter.
+
+Otherwise, FILTER is ignored.
+"
+  (cond
+   ((functionp filter)
+    (let ((result (funcall filter query)))
+      (and result (concat query " and (" result ")"))))
+   ((stringp filter)
+    (concat query " and (" filter ")"))
+   (t (concat query))))
+
+(defun notmuch-hello-query-counts (query-alist &rest options)
+  "Compute list of counts of matched messages from QUERY-ALIST.
+
+QUERY-ALIST must be a list containing elements of the form (NAME . QUERY)
+or (NAME QUERY COUNT-QUERY). If the latter form is used,
+COUNT-QUERY specifies an alternate query to be used to generate
+the count for the associated query.
+
+The result is the list of elements of the form (NAME QUERY COUNT).
+
+The values :show-empty-searches, :make-query and :make-count from
+options will be handled as specified for
+`notmuch-hello-insert-searches'."
+  (notmuch-remove-if-not
+   #'identity
+   (mapcar
+    (lambda (elem)
+      (let* ((name (car elem))
+     (query-and-count (if (consp (cdr elem))
+  ;; do we have a different query for the message count?
+  (cons (second elem) (third elem))
+ (cons (cdr elem) (cdr elem))))
+     (message-count
+      (string-to-number
+       (notmuch-saved-search-count
+ (notmuch-hello-filtered-query (cdr query-and-count)
+      (or (plist-get options :make-count)
+ (plist-get options :make-query)))))))
+ (and (or (plist-get options :show-empty-searches) (> message-count 0))
+   (list name (notmuch-hello-filtered-query
+       (car query-and-count) (plist-get options :make-query))
+ message-count))))
+    query-alist)))
+
+(defun notmuch-hello-insert-buttons (searches)
+  "Insert buttons for SEARCHES.
+
+SEARCHES must be a list containing lists of the form (NAME QUERY COUNT), where
+QUERY is the query to start when the button for the corresponding entry is
+activated. COUNT should be the number of messages matching the query.
+Such a list can be computed with `notmuch-hello-query-counts'."
+  (let* ((widest (notmuch-hello-longest-label searches))
+ (tags-and-width (notmuch-hello-tags-per-line widest))
  (tags-per-line (car tags-and-width))
  (widest (cdr tags-and-width))
  (count 0)
- (reordered-list (notmuch-hello-reflect tag-alist tags-per-line))
+ (reordered-list (notmuch-hello-reflect searches tags-per-line))
  ;; Hack the display of the buttons used.
  (widget-push-button-prefix "")
  (widget-push-button-suffix "")
@@ -253,13 +395,13 @@ should be. Returns a cons cell `(tags-per-line width)'."
     (mapc (lambda (elem)
     ;; (not elem) indicates an empty slot in the matrix.
     (when elem
-      (let* ((name (car elem))
-     (query (cdr elem))
+      (let* ((name (first elem))
+     (query (second elem))
+     (count (third elem))
      (formatted-name (format "%s " name)))
  (widget-insert (format "%8s "
-       (notmuch-hello-nice-number
- (string-to-number (notmuch-saved-search-count query)))))
- (if (string= formatted-name target)
+       (notmuch-hello-nice-number count)))
+ (if (string= formatted-name notmuch-hello-target)
     (setq found-target-pos (point-marker)))
  (widget-create 'push-button
        :notify #'notmuch-hello-widget-search
@@ -277,7 +419,7 @@ should be. Returns a cons cell `(tags-per-line width)'."
     (setq count (1+ count))
     (if (eq (% count tags-per-line) 0)
  (widget-insert "\n")))
-  reordered-list)
+  searches)
 
     ;; If the last line was not full (and hence did not include a
     ;; carriage return), insert one now.
@@ -325,59 +467,272 @@ should be. Returns a cons cell `(tags-per-line width)'."
 (fset 'notmuch-hello-mode-map notmuch-hello-mode-map)
 
 (defun notmuch-hello-mode ()
- "Major mode for convenient notmuch navigation. This is your entry portal into notmuch.
+  "Major mode for convenient notmuch navigation. This is your entry portal into notmuch.
 
 Complete list of currently available key bindings:
 
 \\{notmuch-hello-mode-map}"
- (interactive)
- (kill-all-local-variables)
- (use-local-map notmuch-hello-mode-map)
- (setq major-mode 'notmuch-hello-mode
-       mode-name "notmuch-hello")
- ;;(setq buffer-read-only t)
-)
-
-(defun notmuch-hello-generate-tag-alist ()
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map notmuch-hello-mode-map)
+  (setq major-mode 'notmuch-hello-mode
+ mode-name "notmuch-hello"))
+
+(defun notmuch-hello-generate-tag-alist (&optional hide-tags filter-query filter-count)
   "Return an alist from tags to queries to display in the all-tags section."
   (notmuch-remove-if-not
-   #'cdr
+   #'identity
    (mapcar (lambda (tag)
-     (cons tag
-   (cond
-    ((functionp notmuch-hello-tag-list-make-query)
-     (concat "tag:" tag " and ("
-     (funcall notmuch-hello-tag-list-make-query tag) ")"))
-    ((stringp notmuch-hello-tag-list-make-query)
-     (concat "tag:" tag " and ("
-     notmuch-hello-tag-list-make-query ")"))
-    (t (concat "tag:" tag)))))
+     (let ((query (notmuch-hello-filtered-query (concat "tag:" tag)
+ filter-query)))
+       (when query
+ (if filter-count
+     (list tag (notmuch-hello-filtered-query tag filter-query)
+   (notmuch-hello-filtered-query (concat "tag:" tag)
+ filter-count))
+   (cons tag (notmuch-hello-filtered-query
+      (concat "tag:" tag) filter-query))))))
    (notmuch-remove-if-not
     (lambda (tag)
-      (not (member tag notmuch-hello-hide-tags)))
+      (not (member tag hide-tags)))
     (process-lines notmuch-command "search-tags")))))
 
+(defun notmuch-hello-insert-header ()
+  "Insert the default notmuch-hello header."
+  (when notmuch-show-logo
+    (let ((image notmuch-hello-logo))
+      ;; The notmuch logo uses transparency. That can display poorly
+      ;; when inserting the image into an emacs buffer (black logo on
+      ;; a black background), so force the background colour of the
+      ;; image. We use a face to represent the colour so that
+      ;; `defface' can be used to declare the different possible
+      ;; colours, which depend on whether the frame has a light or
+      ;; dark background.
+      (setq image (cons 'image
+ (append (cdr image)
+ (list :background (face-background 'notmuch-hello-logo-background)))))
+      (insert-image image))
+    (widget-insert "  "))
+
+  (widget-insert "Welcome to ")
+  ;; Hack the display of the links used.
+  (let ((widget-link-prefix "")
+ (widget-link-suffix ""))
+    (widget-create 'link
+   :notify (lambda (&rest ignore)
+     (browse-url notmuch-hello-url))
+   :help-echo "Visit the notmuch website."
+   "notmuch")
+    (widget-insert ". ")
+    (widget-insert "You have ")
+    (widget-create 'link
+   :notify (lambda (&rest ignore)
+     (notmuch-hello-update))
+   :help-echo "Refresh"
+   (notmuch-hello-nice-number
+    (string-to-number (car (process-lines notmuch-command "count")))))
+    (widget-insert " messages.\n")))
+
+
+(defun notmuch-hello-insert-saved-searches ()
+  "Insert the saved-searches section."
+  (let ((searches (notmuch-hello-query-counts
+  notmuch-saved-searches
+  :show-empty-searches notmuch-show-empty-saved-searches))
+ found-target-pos final-target-pos)
+    (when searches
+      (widget-insert "Saved searches: ")
+      (widget-create 'push-button
+     :notify (lambda (&rest ignore)
+       (customize-variable 'notmuch-saved-searches))
+     "edit")
+      (widget-insert "\n\n")
+      (setq final-target-pos (point-marker))
+      (let ((start (point)))
+ (setq found-target-pos
+      (notmuch-hello-insert-buttons searches))
+ (if found-target-pos
+    (setq final-target-pos found-target-pos))
+ (indent-rigidly start (point) notmuch-hello-indent)
+ final-target-pos))))
+
+(defun notmuch-hello-insert-search ()
+  "Insert a search widget."
+  (widget-insert "Search: ")
+  (setq notmuch-hello-search-bar-marker (point-marker))
+  (widget-create 'editable-field
+ ;; Leave some space at the start and end of the
+ ;; search boxes.
+ :size (max 8 (- (window-width) notmuch-hello-indent
+ (length "Search: ")))
+ :action (lambda (widget &rest ignore)
+   (notmuch-hello-search (widget-value widget)))))
+
+(defun notmuch-hello-insert-recent-searches ()
+  "Insert recent searches."
+  (when notmuch-hello-recent-searches
+    (widget-insert "\nRecent searches: ")
+    (widget-create 'push-button
+   :notify (lambda (&rest ignore)
+     (setq notmuch-hello-recent-searches nil)
+     (notmuch-hello-update))
+   "clear")
+    (widget-insert "\n\n")
+    (let ((start (point))
+  (nth 0))
+      (mapc '(lambda (search)
+       (let ((widget-symbol (intern (format "notmuch-hello-search-%d" nth))))
+ (set widget-symbol
+      (widget-create 'editable-field
+     ;; Don't let the search boxes be
+     ;; less than 8 characters wide.
+     :size (max 8
+ (- (window-width)
+   ;; Leave some space
+   ;; at the start and
+   ;; end of the
+   ;; boxes.
+   (* 2 notmuch-hello-indent)
+   ;; 1 for the space
+   ;; before the
+   ;; `[save]' button. 6
+   ;; for the `[save]'
+   ;; button.
+   1 6))
+     :action (lambda (widget &rest ignore)
+       (notmuch-hello-search (widget-value widget)))
+     search))
+ (widget-insert " ")
+ (widget-create 'push-button
+ :notify (lambda (widget &rest ignore)
+  (notmuch-hello-add-saved-search widget))
+ :notmuch-saved-search-widget widget-symbol
+ "save"))
+       (widget-insert "\n")
+       (setq nth (1+ nth)))
+    notmuch-hello-recent-searches)
+      (indent-rigidly start (point) notmuch-hello-indent))))
+
+(defun notmuch-hello-insert-searches (title query-alist &rest options)
+  "Insert a section with TITLE showing a list of buttons made from QUERY-ALIST.
+
+QUERY-ALIST must be a list containing elements of the form (NAME . QUERY)
+or (NAME QUERY COUNT-QUERY). If the latter form is used,
+COUNT-QUERY specifies an alternate query to be used to generate
+the count for the associated item.
+
+Supports the following entries in OPTIONS as a plist:
+:initially-hidden - if non-nil, section will be hidden on startup
+:show-empty-searches - show buttons with no matching messages
+:hide-if-empty - hide if no buttons would be shown
+   (only makes sense without :show-empty-searches)
+:make-query - This can be a function that takes a tag as its argument and
+    returns a filter to be used for the query for that tag or nil to hide the
+    tag. This can also be a string that is used as a filter for messages with that tag.
+:make-count - Seperate query to generate the count that should be displayed for each
+    tag. Accepts the same values as :make-query"
+  (widget-insert title)
+  (if (and notmuch-hello-first-run (plist-get options :initially-hidden))
+      (add-to-list 'notmuch-hello-hidden-sections title))
+  (let ((is-hidden (member title notmuch-hello-hidden-sections))
+ (start (point)))
+    (if is-hidden
+ (widget-create 'push-button
+       :notify `(lambda (widget &rest ignore)
+  (setq notmuch-hello-hidden-sections
+ (delete ,title notmuch-hello-hidden-sections))
+  (notmuch-hello-update))
+       "show")
+      (widget-create 'push-button
+     :notify `(lambda (widget &rest ignore)
+ (add-to-list 'notmuch-hello-hidden-sections
+     ,title)
+ (notmuch-hello-update))
+     "hide"))
+    (widget-insert "\n")
+    (let (target-pos
+  (searches (apply 'notmuch-hello-query-counts query-alist options)))
+      (when (and (not is-hidden)
+       (or (not (plist-get options :hide-if-empty))
+  searches))
+ (widget-insert "\n")
+ (setq target-pos
+      (notmuch-hello-insert-buttons searches))
+ (indent-rigidly start (point) notmuch-hello-indent)
+ target-pos))))
+
+(defun notmuch-hello-insert-tags-section (&optional title &rest options)
+  "Insert a section displaying all tags and message counts for each.
+
+TITLE defaults to \"All tags: \".
+Allowed options are those accepted by `notmuch-hello-insert-searches' and the
+following:
+
+:hide-tags - List of tags that should be excluded."
+  (apply 'notmuch-hello-insert-searches
+ (or title "All tags: ")
+ (notmuch-hello-generate-tag-alist
+  (plist-get options :hide-tags)
+  (plist-get options :make-query)
+  (plist-get options :make-count))
+ options))
+
+(defun notmuch-hello-insert-inbox ()
+  "Show an entry for each saved search and inboxed messages for each tag"
+  (notmuch-hello-insert-searches "What's in your inbox: "
+ (append
+  (notmuch-saved-searches)
+  (notmuch-hello-generate-tag-alist))
+ :make-query "tag:inbox"))
+
+(defun notmuch-hello-insert-alltags ()
+  "Insert a section displaying all tags and associated message counts"
+  (notmuch-hello-insert-tags-section
+   nil
+   :initially-hidden (not notmuch-show-all-tags-list)
+   :make-query notmuch-hello-tag-list-make-query))
+
+(defun notmuch-hello-insert-footer ()
+  "Insert the notmuch-hello footer."
+  (let ((start (point)))
+    (widget-insert "Type a search query and hit RET to view matching threads.\n")
+    (when notmuch-hello-recent-searches
+      (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n")
+      (widget-insert "Save recent searches with the `save' button.\n"))
+    (when notmuch-saved-searches
+      (widget-insert "Edit saved searches with the `edit' button.\n"))
+    (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n")
+    (widget-insert "`=' refreshes this screen. `s' jumps to the search box. `q' to quit.\n")
+    (widget-create 'link
+   :notify (lambda (&rest ignore)
+     (customize-variable 'notmuch-hello-sections))
+   :button-prefix "" :button-suffix ""
+   "Customize")
+    (widget-insert " this page.\n")
+    (let ((fill-column (- (window-width) notmuch-hello-indent)))
+      (center-region start (point)))))
+
 ;;;###autoload
 (defun notmuch-hello (&optional no-display)
   "Run notmuch and display saved searches, known tags, etc."
   (interactive)
 
-  ; Jump through a hoop to get this value from the deprecated variable
-  ; name (`notmuch-folders') or from the default value.
+ ; Jump through a hoop to get this value from the deprecated variable
+ ; name (`notmuch-folders') or from the default value.
   (if (not notmuch-saved-searches)
-    (setq notmuch-saved-searches (notmuch-saved-searches)))
+      (setq notmuch-saved-searches (notmuch-saved-searches)))
 
   (if no-display
       (set-buffer "*notmuch-hello*")
     (switch-to-buffer "*notmuch-hello*"))
 
-  (let ((target (if (widget-at)
-   (widget-value (widget-at))
- (condition-case nil
-     (progn
-       (widget-forward 1)
-       (widget-value (widget-at)))
-   (error nil)))))
+  (let ((notmuch-hello-target (if (widget-at)
+  (widget-value (widget-at))
+ (condition-case nil
+    (progn
+      (widget-forward 1)
+      (widget-value (widget-at)))
+  (error nil)))))
 
     (kill-all-local-variables)
     (let ((inhibit-read-only t))
@@ -391,167 +746,27 @@ Complete list of currently available key bindings:
       (mapc 'delete-overlay (car all))
       (mapc 'delete-overlay (cdr all)))
 
-    (when notmuch-show-logo
-      (let ((image notmuch-hello-logo))
- ;; The notmuch logo uses transparency. That can display poorly
- ;; when inserting the image into an emacs buffer (black logo on
- ;; a black background), so force the background colour of the
- ;; image. We use a face to represent the colour so that
- ;; `defface' can be used to declare the different possible
- ;; colours, which depend on whether the frame has a light or
- ;; dark background.
- (setq image (cons 'image
-  (append (cdr image)
-  (list :background (face-background 'notmuch-hello-logo-background)))))
- (insert-image image))
-      (widget-insert "  "))
-
-    (widget-insert "Welcome to ")
-    ;; Hack the display of the links used.
-    (let ((widget-link-prefix "")
-  (widget-link-suffix ""))
-      (widget-create 'link
-     :notify (lambda (&rest ignore)
-       (browse-url notmuch-hello-url))
-     :help-echo "Visit the notmuch website."
-     "notmuch")
-      (widget-insert ". ")
-      (widget-insert "You have ")
-      (widget-create 'link
-     :notify (lambda (&rest ignore)
-       (notmuch-hello-update))
-     :help-echo "Refresh"
-     (notmuch-hello-nice-number
-      (string-to-number (car (process-lines notmuch-command "count")))))
-      (widget-insert " messages.\n"))
-
-    (let ((found-target-pos nil)
-  (final-target-pos nil))
-      (let* ((saved-alist
-      ;; Filter out empty saved searches if required.
-      (if notmuch-show-empty-saved-searches
-  notmuch-saved-searches
- (loop for elem in notmuch-saved-searches
-      if (> (string-to-number (notmuch-saved-search-count (cdr elem))) 0)
-      collect elem)))
-     (saved-widest (notmuch-hello-longest-label saved-alist))
-     (alltags-alist (if notmuch-show-all-tags-list (notmuch-hello-generate-tag-alist)))
-     (alltags-widest (notmuch-hello-longest-label alltags-alist))
-     (widest (max saved-widest alltags-widest)))
-
- (when saved-alist
-  (widget-insert "\nSaved searches: ")
-  (widget-create 'push-button
- :notify (lambda (&rest ignore)
-   (customize-variable 'notmuch-saved-searches))
- "edit")
-  (widget-insert "\n\n")
-  (setq final-target-pos (point-marker))
-  (let ((start (point)))
-    (setq found-target-pos (notmuch-hello-insert-tags saved-alist widest target))
-    (if found-target-pos
- (setq final-target-pos found-target-pos))
-    (indent-rigidly start (point) notmuch-hello-indent)))
-
- (widget-insert "\nSearch: ")
- (setq notmuch-hello-search-bar-marker (point-marker))
- (widget-create 'editable-field
-       ;; Leave some space at the start and end of the
-       ;; search boxes.
-       :size (max 8 (- (window-width) notmuch-hello-indent
-       (length "Search: ")))
-       :action (lambda (widget &rest ignore)
- (notmuch-hello-search (widget-value widget))))
- (widget-insert "\n")
-
- (when notmuch-hello-recent-searches
-  (widget-insert "\nRecent searches: ")
-  (widget-create 'push-button
- :notify (lambda (&rest ignore)
-   (setq notmuch-hello-recent-searches nil)
-   (notmuch-hello-update))
- "clear")
-  (widget-insert "\n\n")
-  (let ((start (point))
- (nth 0))
-    (mapc '(lambda (search)
-     (let ((widget-symbol (intern (format "notmuch-hello-search-%d" nth))))
-       (set widget-symbol
-    (widget-create 'editable-field
-       ;; Don't let the search boxes be
-       ;; less than 8 characters wide.
-       :size (max 8
-  (- (window-width)
-     ;; Leave some space
-     ;; at the start and
-     ;; end of the
-     ;; boxes.
-     (* 2 notmuch-hello-indent)
-     ;; 1 for the space
-     ;; before the
-     ;; `[save]' button. 6
-     ;; for the `[save]'
-     ;; button.
-     1 6))
-       :action (lambda (widget &rest ignore)
- (notmuch-hello-search (widget-value widget)))
-       search))
-       (widget-insert " ")
-       (widget-create 'push-button
-      :notify (lambda (widget &rest ignore)
- (notmuch-hello-add-saved-search widget))
-      :notmuch-saved-search-widget widget-symbol
-      "save"))
-     (widget-insert "\n")
-     (setq nth (1+ nth)))
-  notmuch-hello-recent-searches)
-    (indent-rigidly start (point) notmuch-hello-indent)))
-
- (when alltags-alist
-  (widget-insert "\nAll tags: ")
-  (widget-create 'push-button
- :notify (lambda (widget &rest ignore)
-   (setq notmuch-show-all-tags-list nil)
-   (notmuch-hello-update))
- "hide")
-  (widget-insert "\n\n")
-  (let ((start (point)))
-    (setq found-target-pos (notmuch-hello-insert-tags alltags-alist widest target))
-    (if (not final-target-pos)
- (setq final-target-pos found-target-pos))
-    (indent-rigidly start (point) notmuch-hello-indent)))
-
- (widget-insert "\n")
-
- (if (not notmuch-show-all-tags-list)
-    (widget-create 'push-button
-   :notify (lambda (widget &rest ignore)
-     (setq notmuch-show-all-tags-list t)
-     (notmuch-hello-update))
-   "Show all tags")))
-
-      (let ((start (point)))
- (widget-insert "\n\n")
- (widget-insert "Type a search query and hit RET to view matching threads.\n")
- (when notmuch-hello-recent-searches
-  (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n")
-  (widget-insert "Save recent searches with the `save' button.\n"))
- (when notmuch-saved-searches
-  (widget-insert "Edit saved searches with the `edit' button.\n"))
- (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n")
- (widget-insert "`=' refreshes this screen. `s' jumps to the search box. `q' to quit.\n")
- (let ((fill-column (- (window-width) notmuch-hello-indent)))
-  (center-region start (point))))
+    (let (final-target-pos)
+      (mapc
+       (lambda (section)
+ (let ((result (if (functionp section)
+   (funcall section)
+ (apply (car section) (cdr section)))))
+   (if (and (not final-target-pos) (integer-or-marker-p result))
+       (setq final-target-pos result))
+     (widget-insert "\n")))
+       notmuch-hello-sections)
 
       (widget-setup)
-
+      
       (when final-target-pos
  (goto-char final-target-pos)
  (unless (widget-at)
   (widget-forward 1)))
-
+      
       (unless (widget-at)
- (notmuch-hello-goto-search)))))
+ (notmuch-hello-goto-search)))
+    (setq notmuch-hello-first-run nil)))
 
 (defun notmuch-folder ()
   "Deprecated function for invoking notmuch---calling `notmuch' is preferred now."
--
1.7.5.4

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe]

---
 test/emacs                                         |   37 ++++++++++++++++++++
 test/emacs.expected-output/notmuch-hello           |    5 ++-
 .../notmuch-hello-new-section                      |    4 ++
 .../notmuch-hello-no-saved-searches                |    4 ++-
 .../notmuch-hello-section-before                   |   18 +++++++++
 .../notmuch-hello-section-counts                   |    5 +++
 .../notmuch-hello-section-hidden-tag               |    4 ++
 .../notmuch-hello-section-with-empty               |    4 ++
 .../emacs.expected-output/notmuch-hello-with-empty |    5 ++-
 9 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 test/emacs.expected-output/notmuch-hello-new-section
 create mode 100644 test/emacs.expected-output/notmuch-hello-section-before
 create mode 100644 test/emacs.expected-output/notmuch-hello-section-counts
 create mode 100644 test/emacs.expected-output/notmuch-hello-section-hidden-tag
 create mode 100644 test/emacs.expected-output/notmuch-hello-section-with-empty

diff --git a/test/emacs b/test/emacs
index 53f455a..40e2563 100755
--- a/test/emacs
+++ b/test/emacs
@@ -34,6 +34,43 @@ test_emacs '(let ((notmuch-saved-searches
       (test-output))'
 test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-no-saved-searches
 
+test_begin_subtest "User defined section with inbox tag"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-searches
+                                     \"Test: \" '((\"inbox\" . \"tag:inbox\")))))))
+           (notmuch-hello)
+           (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-new-section
+
+test_begin_subtest "User defined section with empty, hidden entry"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-searches
+                                     \"Test-with-empty:\"
+                                     '((\"inbox\" . \"tag:inbox\")
+                                       (\"doesnotexist\" . \"tag:doesnotexist\"))
+                                     :hide-empty-searches t)))))
+             (notmuch-hello)
+             (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-with-empty
+
+test_begin_subtest "User defined section, unread tag filtered out"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-tags-section
+                                     \"Test-with-filtered: \"
+                                     :hide-tags '(\"unread\"))))))
+             (notmuch-hello)
+             (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-hidden-tag
+
+test_begin_subtest "User defined section, different query for counts"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-tags-section
+                                     \"Test-with-counts: \"
+                                     :make-count \"tag:signed\")))))
+             (notmuch-hello)
+             (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-counts
+
 test_begin_subtest "Basic notmuch-search view in emacs"
 test_emacs '(notmuch-search "tag:inbox")
     (notmuch-test-wait)
diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello
index 64b7e42..f981650 100644
--- a/test/emacs.expected-output/notmuch-hello
+++ b/test/emacs.expected-output/notmuch-hello
@@ -1,14 +1,15 @@
    Welcome to notmuch. You have 50 messages.
-
 Saved searches: [edit]
 
   50 inbox           50 unread    
 
 Search:                                                                    
 
-[Show all tags]
+All tags: [show]
 
  Type a search query and hit RET to view matching threads.
  Edit saved searches with the `edit' button.
   Hit RET or click on a saved search or tag name to view matching threads.
     `=' refreshes this screen. `s' jumps to the search box. `q' to quit.
+    Customize this page.
+
diff --git a/test/emacs.expected-output/notmuch-hello-new-section b/test/emacs.expected-output/notmuch-hello-new-section
new file mode 100644
index 0000000..be7b26a
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-new-section
@@ -0,0 +1,4 @@
+Test: [hide]
+
+  50 inbox  
+
diff --git a/test/emacs.expected-output/notmuch-hello-no-saved-searches b/test/emacs.expected-output/notmuch-hello-no-saved-searches
index 7f8206a..37b2303 100644
--- a/test/emacs.expected-output/notmuch-hello-no-saved-searches
+++ b/test/emacs.expected-output/notmuch-hello-no-saved-searches
@@ -2,9 +2,11 @@
 
 Search:                                                                    
 
-[Show all tags]
+All tags: [show]
 
  Type a search query and hit RET to view matching threads.
  Edit saved searches with the `edit' button.
   Hit RET or click on a saved search or tag name to view matching threads.
     `=' refreshes this screen. `s' jumps to the search box. `q' to quit.
+    Customize this page.
+
diff --git a/test/emacs.expected-output/notmuch-hello-section-before b/test/emacs.expected-output/notmuch-hello-section-before
new file mode 100644
index 0000000..a5781ce
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-section-before
@@ -0,0 +1,18 @@
+   Welcome to notmuch. You have 50 messages.
+
+Saved searches: [edit]
+
+  50 inbox                 50 unread          
+
+Test-before [hide]
+
+   4 attachment             7 signed          
+  50 inbox                 50 unread          
+
+Search:                                                                    
+
+
+ Type a search query and hit RET to view matching threads.
+ Edit saved searches with the `edit' button.
+  Hit RET or click on a saved search or tag name to view matching threads.
+    `=' refreshes this screen. `s' jumps to the search box. `q' to quit.
diff --git a/test/emacs.expected-output/notmuch-hello-section-counts b/test/emacs.expected-output/notmuch-hello-section-counts
new file mode 100644
index 0000000..12d19ed
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-section-counts
@@ -0,0 +1,5 @@
+Test-with-counts: [hide]
+
+   2 attachment             7 inbox                  7 signed          
+   7 unread          
+
diff --git a/test/emacs.expected-output/notmuch-hello-section-hidden-tag b/test/emacs.expected-output/notmuch-hello-section-hidden-tag
new file mode 100644
index 0000000..eb21c07
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-section-hidden-tag
@@ -0,0 +1,4 @@
+Test-with-filtered: [hide]
+
+   4 attachment            50 inbox                  7 signed          
+
diff --git a/test/emacs.expected-output/notmuch-hello-section-with-empty b/test/emacs.expected-output/notmuch-hello-section-with-empty
new file mode 100644
index 0000000..c5b6623
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-section-with-empty
@@ -0,0 +1,4 @@
+Test-with-empty:[hide]
+
+  50 inbox  
+
diff --git a/test/emacs.expected-output/notmuch-hello-with-empty b/test/emacs.expected-output/notmuch-hello-with-empty
index a9ed630..7d8416d 100644
--- a/test/emacs.expected-output/notmuch-hello-with-empty
+++ b/test/emacs.expected-output/notmuch-hello-with-empty
@@ -1,14 +1,15 @@
    Welcome to notmuch. You have 50 messages.
-
 Saved searches: [edit]
 
   50 inbox           50 unread           0 empty    
 
 Search:                                                                    
 
-[Show all tags]
+All tags: [show]
 
  Type a search query and hit RET to view matching threads.
  Edit saved searches with the `edit' button.
   Hit RET or click on a saved search or tag name to view matching threads.
     `=' refreshes this screen. `s' jumps to the search box. `q' to quit.
+    Customize this page.
+
--
1.7.5.4

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Michal Sojka]

On Fri, 08 Jul 2011, Daniel Schoepe wrote:
> This has been done in v4 of the patch, for which I screwed up the
> In-Reply-To header and hence is listed as a separate thread:
>
> id:"[hidden email]"

Oh, you always send new versions faster than I can investigate the older
ones :-)

> > - The title of custom tags section was not passed correctly to the
> >   functions. This is also fixed in the patch below.
>
> I changed title to a mandatory argument for consistency with
> notmuch-insert-searches and because a title-less section wouldn't make
> much sense anyway.

Yes, this is definitely a good idea. My last comment to the patch is
that I do not like the use of plists in customization interface. It is
especially weird in the case of boolean options like hide-if-empty,
because they actually have three states: disabled, off and on. And this
make not a lot of sense.

I think that the customization interface is much better arranged when it
is modified like in the patch below (it is against v3).

-Michal

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index d3b146e..3e883ff 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -106,17 +106,14 @@ Typically \",\" in the US and UK and \".\" in Europe."
 (define-widget 'notmuch-hello-tags-section 'lazy
   "Customize-type for notmuch-hello tag-list sections."
   :tag "Customized tag-list"
-  :type
-  (let ((opts
-        '((:title (string :tag "Title for this section"))
-          (:make-query (string :tag "Filter for each tag"))
-          (:make-count (string :tag "Different query to generate counts"))
-          (:hide-tags (repeat :tag "Tags that will be hidden" string))
-          (:initially-hidden (boolean :tag "Hide this on startup?"))
-          (:hide-empty-tags (boolean :tag "Hide tags with no matching messages"))
-          (:hide-if-empty (boolean :tag "Hide if empty")))))
-    `(list (const :tag "" notmuch-hello-insert-tags-section)
-          (plist :inline t :options ,opts))))
+  :type '(list (const :tag "" notmuch-hello-insert-tags-section)
+              (string :tag "Title for this section")
+              (string :tag "Filter for each tag")
+              (string :tag "Different filter to generate counts")
+              (repeat :tag "Tags that will be hidden" string)
+              (boolean :tag "Hide this on startup?")
+              (boolean :tag "Hide tags with no matching messages")
+              (boolean :tag "Hide if empty")))
 
 (define-widget 'notmuch-hello-query-section 'lazy
   "Customize-type for custom saved-search-like sections"
@@ -629,7 +626,8 @@ Supports the following entries in OPTIONS as a plist:
        (indent-rigidly start (point) notmuch-hello-indent)
        target-pos))))
 
-(defun notmuch-hello-insert-tags-section (&rest options)
+(defun notmuch-hello-insert-tags-section (title &optional filter filter-count hide-tags initially-hidden
+                                               hide-empty-searches hide-if-empty)
   "Insert a section displaying all tags and message counts for each.
 
 TITLE defaults to \"All tags: \".
@@ -637,13 +635,13 @@ Allowed options are those accepted by `notmuch-hello-insert-searches' and the
 following:
 
 :hide-tags - List of tags that should be excluded."
-  (apply 'notmuch-hello-insert-searches
-        (plist-get options :title)
-        (notmuch-hello-generate-tag-alist
-         (plist-get options :hide-tags)
-         (plist-get options :make-query)
-         (plist-get options :make-count))
-        options))
+  (notmuch-hello-insert-searches title
+                                (notmuch-hello-generate-tag-alist hide-tags filter
+                                                                  (if (string= "" filter-count)
+                                                                      nil filter-count))
+                                :initially-hidden initially-hidden
+                                :hide-empty-searches hide-empty-searches
+                                :hide-if-empty hide-if-empty))
 
 (defun notmuch-hello-insert-inbox ()
   "Show an entry for each saved search and inboxed messages for each tag"
_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe]

On Sat, 09 Jul 2011 01:00:03 +0200, Michal Sojka <[hidden email]> wrote:

> Yes, this is definitely a good idea. My last comment to the patch is
> that I do not like the use of plists in customization interface. It is
> especially weird in the case of boolean options like hide-if-empty,
> because they actually have three states: disabled, off and on. And this
> make not a lot of sense.
>
> I think that the customization interface is much better arranged when it
> is modified like in the patch below (it is against v3).
>
> [..]
> -  :type
> -  (let ((opts
> -        '((:title (string :tag "Title for this section"))
> -          (:make-query (string :tag "Filter for each tag"))
> -          (:make-count (string :tag "Different query to generate counts"))
> -          (:hide-tags (repeat :tag "Tags that will be hidden" string))
> -          (:initially-hidden (boolean :tag "Hide this on startup?"))
> -          (:hide-empty-tags (boolean :tag "Hide tags with no matching messages"))
> -          (:hide-if-empty (boolean :tag "Hide if empty")))))
> -    `(list (const :tag "" notmuch-hello-insert-tags-section)
> -          (plist :inline t :options ,opts))))
> +  :type '(list (const :tag "" notmuch-hello-insert-tags-section)
> +              (string :tag "Title for this section")
> +              (string :tag "Filter for each tag")
> +              (string :tag "Different filter to generate counts")
> +              (repeat :tag "Tags that will be hidden" string)
> +              (boolean :tag "Hide this on startup?")
> +              (boolean :tag "Hide tags with no matching messages")
> +              (boolean :tag "Hide if empty")))
>  

> -(defun notmuch-hello-insert-tags-section (&rest options)
> +(defun notmuch-hello-insert-tags-section (title &optional filter filter-count hide-tags initially-hidden
> +                                               hide-empty-searches hide-if-empty)

This would make customization via elisp somewhat more cumbersome though,
because then one has to specify all preceding optional arguments to set
an option near the end of the argument list. Also, it gets harder to
decipher which value belongs to which option.

An alternative would be to force specifying all possible options in the
customization interface while still producing a plist as a
result. Something along these lines should work:

:type '(list (const :tag "" notmuch-hello-insert-tags-section)
             (const :tag "" :make-query)
             (string :tag "Filter for this tag")
             ...)

I guess the format instructions for the elements would have to be
tweaked a bit more to avoid excessive spacing due to the many hidden
elements.

Cheers,
Daniel

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Michal Sojka]

On Fri, 08 Jul 2011, Daniel Schoepe wrote:
Non-text part: multipart/signed

> On Sat, 09 Jul 2011 01:00:03 +0200, Michal Sojka <[hidden email]> wrote:
> > Yes, this is definitely a good idea. My last comment to the patch is
> > that I do not like the use of plists in customization interface. It is
> > especially weird in the case of boolean options like hide-if-empty,
> > because they actually have three states: disabled, off and on. And this
> > make not a lot of sense.
> >
> > I think that the customization interface is much better arranged when it
> > is modified like in the patch below (it is against v3).
> >
> > [..]
> > -  :type
> > -  (let ((opts
> > -        '((:title (string :tag "Title for this section"))
> > -          (:make-query (string :tag "Filter for each tag"))
> > -          (:make-count (string :tag "Different query to generate counts"))
> > -          (:hide-tags (repeat :tag "Tags that will be hidden" string))
> > -          (:initially-hidden (boolean :tag "Hide this on startup?"))
> > -          (:hide-empty-tags (boolean :tag "Hide tags with no matching messages"))
> > -          (:hide-if-empty (boolean :tag "Hide if empty")))))
> > -    `(list (const :tag "" notmuch-hello-insert-tags-section)
> > -          (plist :inline t :options ,opts))))
> > +  :type '(list (const :tag "" notmuch-hello-insert-tags-section)
> > +              (string :tag "Title for this section")
> > +              (string :tag "Filter for each tag")
> > +              (string :tag "Different filter to generate counts")
> > +              (repeat :tag "Tags that will be hidden" string)
> > +              (boolean :tag "Hide this on startup?")
> > +              (boolean :tag "Hide tags with no matching messages")
> > +              (boolean :tag "Hide if empty")))
> >  
>
> > -(defun notmuch-hello-insert-tags-section (&rest options)
> > +(defun notmuch-hello-insert-tags-section (title &optional filter filter-count hide-tags initially-hidden
> > +                                               hide-empty-searches hide-if-empty)
>
> This would make customization via elisp somewhat more cumbersome though,
> because then one has to specify all preceding optional arguments to set
> an option near the end of the argument list. Also, it gets harder to
> decipher which value belongs to which option.

Not necessarily. In fact, notmuch-hello-insert-tags-section is only a
thin wrapper of notmuch-hello-insert-searches. In elisp you can always
use directly those plist-based "low-level" functions.

-Michal
_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe]

On Sat, 09 Jul 2011 01:00:03 +0200, Michal Sojka <[hidden email]> wrote:
> Yes, this is definitely a good idea. My last comment to the patch is
> that I do not like the use of plists in customization interface. It is
> especially weird in the case of boolean options like hide-if-empty,
> because they actually have three states: disabled, off and on. And this
> make not a lot of sense.

I just realized we overlooked the simplest solution: Changing the (boolean ..)
elements to (const :tag "..." t) elements resolves this nicely.

I'll send a new version shortly.

Cheers,
Daniel

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe]

More documentation/customize improvements.

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe]

This patch makes the notmuch-hello screen fully customizable
by allowing the user to add and remove arbitrary sections. It
also provides some convenience functions for constructing sections,
e.g. showing the unread message count for each tag.

This is done by specifying a list of functions that will be run
when notmuch-hello is invoked.
---
 emacs/notmuch-hello.el |  624 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 423 insertions(+), 201 deletions(-)

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 65fde75..1f51281 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -70,11 +70,6 @@ should return a filter for that tag, or nil to hide the tag."
  (const :tag "Custom filter function" function))
   :group 'notmuch)
 
-(defcustom notmuch-hello-hide-tags nil
-  "List of tags to be hidden in the \"all tags\"-section."
-  :type '(repeat string)
-  :group 'notmuch)
-
 (defface notmuch-hello-logo-background
   '((((class color)
       (background dark))
@@ -123,6 +118,94 @@ Typically \",\" in the US and UK and \".\" in Europe."
 
 (defvar notmuch-hello-recent-searches nil)
 
+(defvar notmuch-custom-section-options
+  '((:filter (string :tag "Filter for each tag"))
+    (:filter-count (string :tag "Different filter message counts"))
+    (:initially-hidden (const :tag "Hide this on startup?" t))
+    (:show-empty-searches (const :tag "Show queries with no matching messages" t))
+    (:hide-if-empty (const :tag "Hide if empty" t)))
+  "Various customization-options for notmuch-hello-tags/query-section.")
+
+(define-widget 'notmuch-hello-tags-section 'lazy
+  "Customize-type for notmuch-hello tag-list sections."
+  :tag "Customized tag-list (see docstring for details)"
+  :type
+  `(list :tag ""
+ (const :tag "" notmuch-hello-insert-tags-section)
+ (string :tag "Title for this section")
+ (plist
+  :inline t
+  :options
+  ,(append notmuch-custom-section-options
+   '((:hide-tags (repeat :tag "Tags that will be hidden"
+ string)))))))
+
+(define-widget 'notmuch-hello-query-section 'lazy
+  "Customize-type for custom saved-search-like sections"
+  :tag "Customized queries section (see docstring for details)"
+  :type
+  `(list :tag ""
+ (const :tag "" notmuch-hello-insert-query-list)
+ (string :tag "Title for this section")
+ (repeat :tag "Queries"
+ (cons (string :tag "Name") (string :tag "Query")))
+ (plist :inline t :options ,notmuch-custom-section-options)))
+
+(defcustom notmuch-hello-sections
+  (list #'notmuch-hello-insert-header
+ #'notmuch-hello-insert-saved-searches
+ #'notmuch-hello-insert-search
+ #'notmuch-hello-insert-recent-searches
+ #'notmuch-hello-insert-alltags
+ #'notmuch-hello-insert-footer)
+  "Sections for notmuch-hello.
+
+Each entry of this list should be a function of no arguments that
+should return if `notmuch-hello-target' is produced as part of its
+output and nil otherwise. For convenience an element can also be
+a list of the form (FUNC ARG1 ARG2 .. ARGN) in which case FUNC
+will be applied to the rest of the list.
+
+The functions will be run to construct the content of the
+notmuch-hello buffer in the order they appear in this list. A
+section should not end with an empty line, because a newline will
+be inserted after each section by `notmuch-hello'.
+
+A \"Customized tag-list\" item in the customize-interface
+displays a list of all tags, optionally hiding some of them. It
+is also possible to filter the list of messages matching each tag
+by an additional filter query. Similarly, the count of messages
+displayed next to the buttons can be generated by applying a
+different filter to the tag query. These filters are also
+supported for \"Customized queries section\" items."
+  :group 'notmuch
+  :type
+  '(repeat
+    (choice (function-item notmuch-hello-insert-header)
+    (function-item notmuch-hello-insert-saved-searches)
+    (function-item notmuch-hello-insert-search)
+    (function-item notmuch-hello-insert-recent-searches)
+    (function-item notmuch-hello-insert-alltags)
+    (function-item notmuch-hello-insert-footer)
+    (function-item notmuch-hello-insert-inbox)
+    notmuch-hello-tags-section
+    notmuch-hello-query-section
+    (function :tag "Custom function"))))
+
+(defvar notmuch-hello-target nil
+  "Button at position of point before rebuilding the notmuch-buffer
+
+This variable contains the string of the button, if any, the
+point was positioned at before the notmuch-hello buffer was
+rebuilt. This is never actually set globally and defined as a
+defvar only for documentation purposes and to avoid a compiler
+warning about it occurring as a free variable.")
+
+(defvar notmuch-hello-hidden-sections nil
+  "List of query section titles whose contents are hidden")
+
+(defvar notmuch-hello-first-run t)
+
 (defun notmuch-hello-remember-search (search)
   (if (not (member search notmuch-hello-recent-searches))
       (push search notmuch-hello-recent-searches))
@@ -173,8 +256,8 @@ Typically \",\" in the US and UK and \".\" in Europe."
     (message "Saved '%s' as '%s'." search name)
     (notmuch-hello-update)))
 
-(defun notmuch-hello-longest-label (tag-alist)
-  (or (loop for elem in tag-alist
+(defun notmuch-hello-longest-label (searches-alist)
+  (or (loop for elem in searches-alist
     maximize (length (car elem)))
       0))
 
@@ -238,12 +321,71 @@ should be. Returns a cons cell `(tags-per-line width)'."
    (* tags-per-line (+ 9 1))))
    tags-per-line))))
 
-(defun notmuch-hello-insert-tags (tag-alist widest target)
-  (let* ((tags-and-width (notmuch-hello-tags-per-line widest))
+(defun notmuch-hello-filtered-query (query filter)
+  "Constructs a query to search all messages matching QUERY and FILTER.
+
+If FILTER is a string, it is directly used in the returned query.
+
+If FILTER is a function, it is called with QUERY as a parameter and
+the string it returns is used as the filter.
+
+Otherwise, FILTER is ignored.
+"
+  (cond
+   ((functionp filter)
+    (let ((result (funcall filter query)))
+      (and result (concat query " and (" result ")"))))
+   ((stringp filter)
+    (concat query " and (" filter ")"))
+   (t (concat query))))
+
+(defun notmuch-hello-query-counts (query-alist &rest options)
+  "Compute list of counts of matched messages from QUERY-ALIST.
+
+QUERY-ALIST must be a list containing elements of the form (NAME . QUERY)
+or (NAME QUERY COUNT-QUERY). If the latter form is used,
+COUNT-QUERY specifies an alternate query to be used to generate
+the count for the associated query.
+
+The result is the list of elements of the form (NAME QUERY COUNT).
+
+The values :show-empty-searches, :filter and :filter-count from
+options will be handled as specified for
+`notmuch-hello-insert-searches'."
+  (notmuch-remove-if-not
+   #'identity
+   (mapcar
+    (lambda (elem)
+      (let* ((name (car elem))
+     (query-and-count (if (consp (cdr elem))
+  ;; do we have a different query for the message count?
+  (cons (second elem) (third elem))
+ (cons (cdr elem) (cdr elem))))
+     (message-count
+      (string-to-number
+       (notmuch-saved-search-count
+ (notmuch-hello-filtered-query (cdr query-and-count)
+      (or (plist-get options :filter-count)
+ (plist-get options :filter)))))))
+ (and (or (plist-get options :show-empty-searches) (> message-count 0))
+   (list name (notmuch-hello-filtered-query
+       (car query-and-count) (plist-get options :filter))
+ message-count))))
+    query-alist)))
+
+(defun notmuch-hello-insert-buttons (searches)
+  "Insert buttons for SEARCHES.
+
+SEARCHES must be a list containing lists of the form (NAME QUERY COUNT), where
+QUERY is the query to start when the button for the corresponding entry is
+activated. COUNT should be the number of messages matching the query.
+Such a list can be computed with `notmuch-hello-query-counts'."
+  (let* ((widest (notmuch-hello-longest-label searches))
+ (tags-and-width (notmuch-hello-tags-per-line widest))
  (tags-per-line (car tags-and-width))
  (widest (cdr tags-and-width))
  (count 0)
- (reordered-list (notmuch-hello-reflect tag-alist tags-per-line))
+ (reordered-list (notmuch-hello-reflect searches tags-per-line))
  ;; Hack the display of the buttons used.
  (widget-push-button-prefix "")
  (widget-push-button-suffix "")
@@ -253,13 +395,13 @@ should be. Returns a cons cell `(tags-per-line width)'."
     (mapc (lambda (elem)
     ;; (not elem) indicates an empty slot in the matrix.
     (when elem
-      (let* ((name (car elem))
-     (query (cdr elem))
+      (let* ((name (first elem))
+     (query (second elem))
+     (count (third elem))
      (formatted-name (format "%s " name)))
  (widget-insert (format "%8s "
-       (notmuch-hello-nice-number
- (string-to-number (notmuch-saved-search-count query)))))
- (if (string= formatted-name target)
+       (notmuch-hello-nice-number count)))
+ (if (string= formatted-name notmuch-hello-target)
     (setq found-target-pos (point-marker)))
  (widget-create 'push-button
        :notify #'notmuch-hello-widget-search
@@ -277,7 +419,7 @@ should be. Returns a cons cell `(tags-per-line width)'."
     (setq count (1+ count))
     (if (eq (% count tags-per-line) 0)
  (widget-insert "\n")))
-  reordered-list)
+  searches)
 
     ;; If the last line was not full (and hence did not include a
     ;; carriage return), insert one now.
@@ -325,59 +467,275 @@ should be. Returns a cons cell `(tags-per-line width)'."
 (fset 'notmuch-hello-mode-map notmuch-hello-mode-map)
 
 (defun notmuch-hello-mode ()
- "Major mode for convenient notmuch navigation. This is your entry portal into notmuch.
+  "Major mode for convenient notmuch navigation. This is your entry portal into notmuch.
 
 Complete list of currently available key bindings:
 
 \\{notmuch-hello-mode-map}"
- (interactive)
- (kill-all-local-variables)
- (use-local-map notmuch-hello-mode-map)
- (setq major-mode 'notmuch-hello-mode
-       mode-name "notmuch-hello")
- ;;(setq buffer-read-only t)
-)
-
-(defun notmuch-hello-generate-tag-alist ()
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map notmuch-hello-mode-map)
+  (setq major-mode 'notmuch-hello-mode
+ mode-name "notmuch-hello"))
+
+(defun notmuch-hello-generate-tag-alist (&optional hide-tags filter-query filter-count)
   "Return an alist from tags to queries to display in the all-tags section."
   (notmuch-remove-if-not
-   #'cdr
+   #'identity
    (mapcar (lambda (tag)
-     (cons tag
-   (cond
-    ((functionp notmuch-hello-tag-list-make-query)
-     (concat "tag:" tag " and ("
-     (funcall notmuch-hello-tag-list-make-query tag) ")"))
-    ((stringp notmuch-hello-tag-list-make-query)
-     (concat "tag:" tag " and ("
-     notmuch-hello-tag-list-make-query ")"))
-    (t (concat "tag:" tag)))))
+     (let ((query (notmuch-hello-filtered-query (concat "tag:" tag)
+ filter-query)))
+       (when query
+ (if filter-count
+     (list tag (notmuch-hello-filtered-query tag filter-query)
+   (notmuch-hello-filtered-query (concat "tag:" tag)
+ filter-count))
+   (cons tag (notmuch-hello-filtered-query
+      (concat "tag:" tag) filter-query))))))
    (notmuch-remove-if-not
     (lambda (tag)
-      (not (member tag notmuch-hello-hide-tags)))
+      (not (member tag hide-tags)))
     (process-lines notmuch-command "search-tags")))))
 
+(defun notmuch-hello-insert-header ()
+  "Insert the default notmuch-hello header."
+  (when notmuch-show-logo
+    (let ((image notmuch-hello-logo))
+      ;; The notmuch logo uses transparency. That can display poorly
+      ;; when inserting the image into an emacs buffer (black logo on
+      ;; a black background), so force the background colour of the
+      ;; image. We use a face to represent the colour so that
+      ;; `defface' can be used to declare the different possible
+      ;; colours, which depend on whether the frame has a light or
+      ;; dark background.
+      (setq image (cons 'image
+ (append (cdr image)
+ (list :background (face-background 'notmuch-hello-logo-background)))))
+      (insert-image image))
+    (widget-insert "  "))
+
+  (widget-insert "Welcome to ")
+  ;; Hack the display of the links used.
+  (let ((widget-link-prefix "")
+ (widget-link-suffix ""))
+    (widget-create 'link
+   :notify (lambda (&rest ignore)
+     (browse-url notmuch-hello-url))
+   :help-echo "Visit the notmuch website."
+   "notmuch")
+    (widget-insert ". ")
+    (widget-insert "You have ")
+    (widget-create 'link
+   :notify (lambda (&rest ignore)
+     (notmuch-hello-update))
+   :help-echo "Refresh"
+   (notmuch-hello-nice-number
+    (string-to-number (car (process-lines notmuch-command "count")))))
+    (widget-insert " messages.\n")))
+
+
+(defun notmuch-hello-insert-saved-searches ()
+  "Insert the saved-searches section."
+  (let ((searches (notmuch-hello-query-counts
+  notmuch-saved-searches
+  :show-empty-searches notmuch-show-empty-saved-searches))
+ found-target-pos final-target-pos)
+    (when searches
+      (widget-insert "Saved searches: ")
+      (widget-create 'push-button
+     :notify (lambda (&rest ignore)
+       (customize-variable 'notmuch-saved-searches))
+     "edit")
+      (widget-insert "\n\n")
+      (setq final-target-pos (point-marker))
+      (let ((start (point)))
+ (setq found-target-pos
+      (notmuch-hello-insert-buttons searches))
+ (if found-target-pos
+    (setq final-target-pos found-target-pos))
+ (indent-rigidly start (point) notmuch-hello-indent)
+ final-target-pos))))
+
+(defun notmuch-hello-insert-search ()
+  "Insert a search widget."
+  (widget-insert "Search: ")
+  (setq notmuch-hello-search-bar-marker (point-marker))
+  (widget-create 'editable-field
+ ;; Leave some space at the start and end of the
+ ;; search boxes.
+ :size (max 8 (- (window-width) notmuch-hello-indent
+ (length "Search: ")))
+ :action (lambda (widget &rest ignore)
+   (notmuch-hello-search (widget-value widget))))
+  (insert "\n"))
+
+(defun notmuch-hello-insert-recent-searches ()
+  "Insert recent searches."
+  (when notmuch-hello-recent-searches
+    (widget-insert "Recent searches: ")
+    (widget-create 'push-button
+   :notify (lambda (&rest ignore)
+     (setq notmuch-hello-recent-searches nil)
+     (notmuch-hello-update))
+   "clear")
+    (widget-insert "\n\n")
+    (let ((start (point))
+  (nth 0))
+      (mapc '(lambda (search)
+       (let ((widget-symbol (intern (format "notmuch-hello-search-%d" nth))))
+ (set widget-symbol
+      (widget-create 'editable-field
+     ;; Don't let the search boxes be
+     ;; less than 8 characters wide.
+     :size (max 8
+ (- (window-width)
+   ;; Leave some space
+   ;; at the start and
+   ;; end of the
+   ;; boxes.
+   (* 2 notmuch-hello-indent)
+   ;; 1 for the space
+   ;; before the
+   ;; `[save]' button. 6
+   ;; for the `[save]'
+   ;; button.
+   1 6))
+     :action (lambda (widget &rest ignore)
+       (notmuch-hello-search (widget-value widget)))
+     search))
+ (widget-insert " ")
+ (widget-create 'push-button
+ :notify (lambda (widget &rest ignore)
+  (notmuch-hello-add-saved-search widget))
+ :notmuch-saved-search-widget widget-symbol
+ "save"))
+       (widget-insert "\n")
+       (setq nth (1+ nth)))
+    notmuch-hello-recent-searches)
+      (indent-rigidly start (point) notmuch-hello-indent))))
+
+(defun notmuch-hello-insert-searches (title query-alist &rest options)
+  "Insert a section with TITLE showing a list of buttons made from QUERY-ALIST.
+
+QUERY-ALIST must be a list containing elements of the form (NAME . QUERY)
+or (NAME QUERY COUNT-QUERY). If the latter form is used,
+COUNT-QUERY specifies an alternate query to be used to generate
+the count for the associated item.
+
+Supports the following entries in OPTIONS as a plist:
+:initially-hidden - if non-nil, section will be hidden on startup
+:show-empty-searches - show buttons with no matching messages
+:hide-if-empty - hide if no buttons would be shown
+   (only makes sense without :show-empty-searches)
+:filter - This can be a function that takes the search query as its argument and
+    returns a filter to be used in conjuction with the query for that search or nil
+    to hide the element. This can also be a string that is used as a combined with
+    each query using \"and\".
+:filter-count - Separate filter to generate the count displayed each search. Accepts
+    the same values as :filter. If :filter and :filter-count are specified, this
+    will be used instead of :filter, not in conjunction with it."
+  (widget-insert title ": ")
+  (if (and notmuch-hello-first-run (plist-get options :initially-hidden))
+      (add-to-list 'notmuch-hello-hidden-sections title))
+  (let ((is-hidden (member title notmuch-hello-hidden-sections))
+ (start (point)))
+    (if is-hidden
+ (widget-create 'push-button
+       :notify `(lambda (widget &rest ignore)
+  (setq notmuch-hello-hidden-sections
+ (delete ,title notmuch-hello-hidden-sections))
+  (notmuch-hello-update))
+       "show")
+      (widget-create 'push-button
+     :notify `(lambda (widget &rest ignore)
+ (add-to-list 'notmuch-hello-hidden-sections
+     ,title)
+ (notmuch-hello-update))
+     "hide"))
+    (widget-insert "\n")
+    (let (target-pos
+  (searches (apply 'notmuch-hello-query-counts query-alist options)))
+      (when (and (not is-hidden)
+       (or (not (plist-get options :hide-if-empty))
+  searches))
+ (widget-insert "\n")
+ (setq target-pos
+      (notmuch-hello-insert-buttons searches))
+ (indent-rigidly start (point) notmuch-hello-indent)
+ target-pos))))
+
+(defun notmuch-hello-insert-tags-section (&optional title &rest options)
+  "Insert a section displaying all tags and message counts for each.
+
+TITLE defaults to \"All tags\".
+Allowed options are those accepted by `notmuch-hello-insert-searches' and the
+following:
+
+:hide-tags - List of tags that should be excluded."
+  (apply 'notmuch-hello-insert-searches
+ (or title "All tags")
+ (notmuch-hello-generate-tag-alist
+  (plist-get options :hide-tags)
+  (plist-get options :filter)
+  (plist-get options :filter-count))
+ options))
+
+(defun notmuch-hello-insert-inbox ()
+  "Show an entry for each saved search and inboxed messages for each tag"
+  (notmuch-hello-insert-searches "What's in your inbox: "
+ (append
+  (notmuch-saved-searches)
+  (notmuch-hello-generate-tag-alist))
+ :filter "tag:inbox"))
+
+(defun notmuch-hello-insert-alltags ()
+  "Insert a section displaying all tags and associated message counts"
+  (notmuch-hello-insert-tags-section
+   nil
+   :initially-hidden (not notmuch-show-all-tags-list)
+   :filter notmuch-hello-tag-list-make-query))
+
+(defun notmuch-hello-insert-footer ()
+  "Insert the notmuch-hello footer."
+  (let ((start (point)))
+    (widget-insert "Type a search query and hit RET to view matching threads.\n")
+    (when notmuch-hello-recent-searches
+      (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n")
+      (widget-insert "Save recent searches with the `save' button.\n"))
+    (when notmuch-saved-searches
+      (widget-insert "Edit saved searches with the `edit' button.\n"))
+    (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n")
+    (widget-insert "`=' refreshes this screen. `s' jumps to the search box. `q' to quit.\n")
+    (widget-create 'link
+   :notify (lambda (&rest ignore)
+     (customize-variable 'notmuch-hello-sections))
+   :button-prefix "" :button-suffix ""
+   "Customize")
+    (widget-insert " this page.\n")
+    (let ((fill-column (- (window-width) notmuch-hello-indent)))
+      (center-region start (point)))))
+
 ;;;###autoload
 (defun notmuch-hello (&optional no-display)
   "Run notmuch and display saved searches, known tags, etc."
   (interactive)
 
-  ; Jump through a hoop to get this value from the deprecated variable
-  ; name (`notmuch-folders') or from the default value.
+ ; Jump through a hoop to get this value from the deprecated variable
+ ; name (`notmuch-folders') or from the default value.
   (if (not notmuch-saved-searches)
-    (setq notmuch-saved-searches (notmuch-saved-searches)))
+      (setq notmuch-saved-searches (notmuch-saved-searches)))
 
   (if no-display
       (set-buffer "*notmuch-hello*")
     (switch-to-buffer "*notmuch-hello*"))
 
-  (let ((target (if (widget-at)
-   (widget-value (widget-at))
- (condition-case nil
-     (progn
-       (widget-forward 1)
-       (widget-value (widget-at)))
-   (error nil)))))
+  (let ((notmuch-hello-target (if (widget-at)
+  (widget-value (widget-at))
+ (condition-case nil
+    (progn
+      (widget-forward 1)
+      (widget-value (widget-at)))
+  (error nil)))))
 
     (kill-all-local-variables)
     (let ((inhibit-read-only t))
@@ -391,167 +749,31 @@ Complete list of currently available key bindings:
       (mapc 'delete-overlay (car all))
       (mapc 'delete-overlay (cdr all)))
 
-    (when notmuch-show-logo
-      (let ((image notmuch-hello-logo))
- ;; The notmuch logo uses transparency. That can display poorly
- ;; when inserting the image into an emacs buffer (black logo on
- ;; a black background), so force the background colour of the
- ;; image. We use a face to represent the colour so that
- ;; `defface' can be used to declare the different possible
- ;; colours, which depend on whether the frame has a light or
- ;; dark background.
- (setq image (cons 'image
-  (append (cdr image)
-  (list :background (face-background 'notmuch-hello-logo-background)))))
- (insert-image image))
-      (widget-insert "  "))
-
-    (widget-insert "Welcome to ")
-    ;; Hack the display of the links used.
-    (let ((widget-link-prefix "")
-  (widget-link-suffix ""))
-      (widget-create 'link
-     :notify (lambda (&rest ignore)
-       (browse-url notmuch-hello-url))
-     :help-echo "Visit the notmuch website."
-     "notmuch")
-      (widget-insert ". ")
-      (widget-insert "You have ")
-      (widget-create 'link
-     :notify (lambda (&rest ignore)
-       (notmuch-hello-update))
-     :help-echo "Refresh"
-     (notmuch-hello-nice-number
-      (string-to-number (car (process-lines notmuch-command "count")))))
-      (widget-insert " messages.\n"))
-
-    (let ((found-target-pos nil)
-  (final-target-pos nil))
-      (let* ((saved-alist
-      ;; Filter out empty saved searches if required.
-      (if notmuch-show-empty-saved-searches
-  notmuch-saved-searches
- (loop for elem in notmuch-saved-searches
-      if (> (string-to-number (notmuch-saved-search-count (cdr elem))) 0)
-      collect elem)))
-     (saved-widest (notmuch-hello-longest-label saved-alist))
-     (alltags-alist (if notmuch-show-all-tags-list (notmuch-hello-generate-tag-alist)))
-     (alltags-widest (notmuch-hello-longest-label alltags-alist))
-     (widest (max saved-widest alltags-widest)))
-
- (when saved-alist
-  (widget-insert "\nSaved searches: ")
-  (widget-create 'push-button
- :notify (lambda (&rest ignore)
-   (customize-variable 'notmuch-saved-searches))
- "edit")
-  (widget-insert "\n\n")
-  (setq final-target-pos (point-marker))
-  (let ((start (point)))
-    (setq found-target-pos (notmuch-hello-insert-tags saved-alist widest target))
-    (if found-target-pos
- (setq final-target-pos found-target-pos))
-    (indent-rigidly start (point) notmuch-hello-indent)))
-
- (widget-insert "\nSearch: ")
- (setq notmuch-hello-search-bar-marker (point-marker))
- (widget-create 'editable-field
-       ;; Leave some space at the start and end of the
-       ;; search boxes.
-       :size (max 8 (- (window-width) notmuch-hello-indent
-       (length "Search: ")))
-       :action (lambda (widget &rest ignore)
- (notmuch-hello-search (widget-value widget))))
- (widget-insert "\n")
-
- (when notmuch-hello-recent-searches
-  (widget-insert "\nRecent searches: ")
-  (widget-create 'push-button
- :notify (lambda (&rest ignore)
-   (setq notmuch-hello-recent-searches nil)
-   (notmuch-hello-update))
- "clear")
-  (widget-insert "\n\n")
-  (let ((start (point))
- (nth 0))
-    (mapc '(lambda (search)
-     (let ((widget-symbol (intern (format "notmuch-hello-search-%d" nth))))
-       (set widget-symbol
-    (widget-create 'editable-field
-       ;; Don't let the search boxes be
-       ;; less than 8 characters wide.
-       :size (max 8
-  (- (window-width)
-     ;; Leave some space
-     ;; at the start and
-     ;; end of the
-     ;; boxes.
-     (* 2 notmuch-hello-indent)
-     ;; 1 for the space
-     ;; before the
-     ;; `[save]' button. 6
-     ;; for the `[save]'
-     ;; button.
-     1 6))
-       :action (lambda (widget &rest ignore)
- (notmuch-hello-search (widget-value widget)))
-       search))
-       (widget-insert " ")
-       (widget-create 'push-button
-      :notify (lambda (widget &rest ignore)
- (notmuch-hello-add-saved-search widget))
-      :notmuch-saved-search-widget widget-symbol
-      "save"))
-     (widget-insert "\n")
-     (setq nth (1+ nth)))
-  notmuch-hello-recent-searches)
-    (indent-rigidly start (point) notmuch-hello-indent)))
-
- (when alltags-alist
-  (widget-insert "\nAll tags: ")
-  (widget-create 'push-button
- :notify (lambda (widget &rest ignore)
-   (setq notmuch-show-all-tags-list nil)
-   (notmuch-hello-update))
- "hide")
-  (widget-insert "\n\n")
-  (let ((start (point)))
-    (setq found-target-pos (notmuch-hello-insert-tags alltags-alist widest target))
-    (if (not final-target-pos)
- (setq final-target-pos found-target-pos))
-    (indent-rigidly start (point) notmuch-hello-indent)))
-
- (widget-insert "\n")
-
- (if (not notmuch-show-all-tags-list)
-    (widget-create 'push-button
-   :notify (lambda (widget &rest ignore)
-     (setq notmuch-show-all-tags-list t)
-     (notmuch-hello-update))
-   "Show all tags")))
-
-      (let ((start (point)))
- (widget-insert "\n\n")
- (widget-insert "Type a search query and hit RET to view matching threads.\n")
- (when notmuch-hello-recent-searches
-  (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n")
-  (widget-insert "Save recent searches with the `save' button.\n"))
- (when notmuch-saved-searches
-  (widget-insert "Edit saved searches with the `edit' button.\n"))
- (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n")
- (widget-insert "`=' refreshes this screen. `s' jumps to the search box. `q' to quit.\n")
- (let ((fill-column (- (window-width) notmuch-hello-indent)))
-  (center-region start (point))))
+    (let (final-target-pos)
+      (mapc
+       (lambda (section)
+ (let ((point-before (point))
+       (result (if (functionp section)
+   (funcall section)
+ (apply (car section) (cdr section)))))
+   (if (and (not final-target-pos) (integer-or-marker-p result))
+       (setq final-target-pos result))
+   ;; don't insert a newline when the previous section didn't show
+   ;; anything.
+   (unless (eq (point) point-before)
+     (widget-insert "\n"))))
+       notmuch-hello-sections)
 
       (widget-setup)
-
+      
       (when final-target-pos
  (goto-char final-target-pos)
  (unless (widget-at)
   (widget-forward 1)))
-
+      
       (unless (widget-at)
- (notmuch-hello-goto-search)))))
+ (notmuch-hello-goto-search)))
+    (setq notmuch-hello-first-run nil)))
 
 (defun notmuch-folder ()
   "Deprecated function for invoking notmuch---calling `notmuch' is preferred now."
--
1.7.5.4

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe]

---
 test/emacs                                         |   37 ++++++++++++++++++++
 test/emacs.expected-output/notmuch-hello           |    4 ++-
 .../notmuch-hello-new-section                      |    4 ++
 .../notmuch-hello-no-saved-searches                |    4 ++-
 .../notmuch-hello-section-counts                   |    5 +++
 .../notmuch-hello-section-hidden-tag               |    4 ++
 .../notmuch-hello-section-with-empty               |    4 ++
 .../emacs.expected-output/notmuch-hello-with-empty |    4 ++-
 8 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 test/emacs.expected-output/notmuch-hello-new-section
 create mode 100644 test/emacs.expected-output/notmuch-hello-section-counts
 create mode 100644 test/emacs.expected-output/notmuch-hello-section-hidden-tag
 create mode 100644 test/emacs.expected-output/notmuch-hello-section-with-empty

diff --git a/test/emacs b/test/emacs
index 53f455a..2bf5c08 100755
--- a/test/emacs
+++ b/test/emacs
@@ -34,6 +34,43 @@ test_emacs '(let ((notmuch-saved-searches
       (test-output))'
 test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-no-saved-searches
 
+test_begin_subtest "User defined section with inbox tag"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-searches
+                                     \"Test\" '((\"inbox\" . \"tag:inbox\")))))))
+           (notmuch-hello)
+           (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-new-section
+
+test_begin_subtest "User defined section with empty, hidden entry"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-searches
+                                     \"Test-with-empty\"
+                                     '((\"inbox\" . \"tag:inbox\")
+                                       (\"doesnotexist\" . \"tag:doesnotexist\"))
+                                     :hide-empty-searches t)))))
+             (notmuch-hello)
+             (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-with-empty
+
+test_begin_subtest "User defined section, unread tag filtered out"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-tags-section
+                                     \"Test-with-filtered\"
+                                     :hide-tags '(\"unread\"))))))
+             (notmuch-hello)
+             (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-hidden-tag
+
+test_begin_subtest "User defined section, different query for counts"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-tags-section
+                                     \"Test-with-counts\"
+                                     :filter-count \"tag:signed\")))))
+             (notmuch-hello)
+             (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-counts
+
 test_begin_subtest "Basic notmuch-search view in emacs"
 test_emacs '(notmuch-search "tag:inbox")
     (notmuch-test-wait)
diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello
index 64b7e42..fd512d3 100644
--- a/test/emacs.expected-output/notmuch-hello
+++ b/test/emacs.expected-output/notmuch-hello
@@ -6,9 +6,11 @@ Saved searches: [edit]
 
 Search:                                                                    
 
-[Show all tags]
+All tags: [show]
 
  Type a search query and hit RET to view matching threads.
  Edit saved searches with the `edit' button.
   Hit RET or click on a saved search or tag name to view matching threads.
     `=' refreshes this screen. `s' jumps to the search box. `q' to quit.
+    Customize this page.
+
diff --git a/test/emacs.expected-output/notmuch-hello-new-section b/test/emacs.expected-output/notmuch-hello-new-section
new file mode 100644
index 0000000..be7b26a
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-new-section
@@ -0,0 +1,4 @@
+Test: [hide]
+
+  50 inbox  
+
diff --git a/test/emacs.expected-output/notmuch-hello-no-saved-searches b/test/emacs.expected-output/notmuch-hello-no-saved-searches
index 7f8206a..37b2303 100644
--- a/test/emacs.expected-output/notmuch-hello-no-saved-searches
+++ b/test/emacs.expected-output/notmuch-hello-no-saved-searches
@@ -2,9 +2,11 @@
 
 Search:                                                                    
 
-[Show all tags]
+All tags: [show]
 
  Type a search query and hit RET to view matching threads.
  Edit saved searches with the `edit' button.
   Hit RET or click on a saved search or tag name to view matching threads.
     `=' refreshes this screen. `s' jumps to the search box. `q' to quit.
+    Customize this page.
+
diff --git a/test/emacs.expected-output/notmuch-hello-section-counts b/test/emacs.expected-output/notmuch-hello-section-counts
new file mode 100644
index 0000000..12d19ed
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-section-counts
@@ -0,0 +1,5 @@
+Test-with-counts: [hide]
+
+   2 attachment             7 inbox                  7 signed          
+   7 unread          
+
diff --git a/test/emacs.expected-output/notmuch-hello-section-hidden-tag b/test/emacs.expected-output/notmuch-hello-section-hidden-tag
new file mode 100644
index 0000000..eb21c07
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-section-hidden-tag
@@ -0,0 +1,4 @@
+Test-with-filtered: [hide]
+
+   4 attachment            50 inbox                  7 signed          
+
diff --git a/test/emacs.expected-output/notmuch-hello-section-with-empty b/test/emacs.expected-output/notmuch-hello-section-with-empty
new file mode 100644
index 0000000..4481dca
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-section-with-empty
@@ -0,0 +1,4 @@
+Test-with-empty: [hide]
+
+  50 inbox  
+
diff --git a/test/emacs.expected-output/notmuch-hello-with-empty b/test/emacs.expected-output/notmuch-hello-with-empty
index a9ed630..220fac4 100644
--- a/test/emacs.expected-output/notmuch-hello-with-empty
+++ b/test/emacs.expected-output/notmuch-hello-with-empty
@@ -6,9 +6,11 @@ Saved searches: [edit]
 
 Search:                                                                    
 
-[Show all tags]
+All tags: [show]
 
  Type a search query and hit RET to view matching threads.
  Edit saved searches with the `edit' button.
   Hit RET or click on a saved search or tag name to view matching threads.
     `=' refreshes this screen. `s' jumps to the search box. `q' to quit.
+    Customize this page.
+
--
1.7.5.4

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe]

---
 NEWS |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index f3fefad..98a6b28 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Notmuch 0.7 (YYYY-MM-DD)
+=======================
+New emacs-interface features
+----------------------------
+Customizable notmuch-hello page
+
+  The notmuch-hello page can now be customized using the
+  notmuch-hello-sections variable. It allows removing and adding
+  arbitrary sections (functions that insert UI elements).  Various
+  often-used, configurable section types are also provided. This
+  feature is also fully usable via the customize-interface. For more
+  information, see `M-x describe-variable notmuch-hello-sections'.
+
 Notmuch 0.6 (2011-07-01)
 =======================
 New, general features
--
1.7.5.4

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe]

On Sat,  9 Jul 2011 20:03:16 +0200, Daniel Schoepe <[hidden email]> wrote:
> More documentation/customize improvements.

I know this is quite a large commit, but has anyone else had the time to
review this? I didn't notice any more flaws since the fifth version and
it made the hello page a lot more useful for me.

Cheers,
Daniel

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Michal Sojka]

On Sun, 14 Aug 2011, Daniel Schoepe wrote:
> On Sat,  9 Jul 2011 20:03:16 +0200, Daniel Schoepe <[hidden email]> wrote:
> > More documentation/customize improvements.
>
> I know this is quite a large commit, but has anyone else had the time to
> review this? I didn't notice any more flaws since the fifth version and
> it made the hello page a lot more useful for me.

Hi Daniel,

I'm probably not "anyone else", but I discovered one cosmetic thing
which can be changed in the patch:

-  (notmuch-hello-insert-searches "What's in your inbox: "
+  (notmuch-hello-insert-searches "What's in your inbox"
 
-Michal
_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe-2]

Fixed that and rebased against master.

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe-2]

From: Daniel Schoepe <[hidden email]>

This patch makes the notmuch-hello screen fully customizable
by allowing the user to add and remove arbitrary sections. It
also provides some convenience functions for constructing sections,
e.g. showing the unread message count for each tag.

This is done by specifying a list of functions that will be run
when notmuch-hello is invoked.
---
 emacs/notmuch-hello.el |  624 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 423 insertions(+), 201 deletions(-)

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 65fde75..f7ec4dd 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -70,11 +70,6 @@ should return a filter for that tag, or nil to hide the tag."
  (const :tag "Custom filter function" function))
   :group 'notmuch)
 
-(defcustom notmuch-hello-hide-tags nil
-  "List of tags to be hidden in the \"all tags\"-section."
-  :type '(repeat string)
-  :group 'notmuch)
-
 (defface notmuch-hello-logo-background
   '((((class color)
       (background dark))
@@ -123,6 +118,94 @@ Typically \",\" in the US and UK and \".\" in Europe."
 
 (defvar notmuch-hello-recent-searches nil)
 
+(defvar notmuch-custom-section-options
+  '((:filter (string :tag "Filter for each tag"))
+    (:filter-count (string :tag "Different filter message counts"))
+    (:initially-hidden (const :tag "Hide this on startup?" t))
+    (:show-empty-searches (const :tag "Show queries with no matching messages" t))
+    (:hide-if-empty (const :tag "Hide if empty" t)))
+  "Various customization-options for notmuch-hello-tags/query-section.")
+
+(define-widget 'notmuch-hello-tags-section 'lazy
+  "Customize-type for notmuch-hello tag-list sections."
+  :tag "Customized tag-list (see docstring for details)"
+  :type
+  `(list :tag ""
+ (const :tag "" notmuch-hello-insert-tags-section)
+ (string :tag "Title for this section")
+ (plist
+  :inline t
+  :options
+  ,(append notmuch-custom-section-options
+   '((:hide-tags (repeat :tag "Tags that will be hidden"
+ string)))))))
+
+(define-widget 'notmuch-hello-query-section 'lazy
+  "Customize-type for custom saved-search-like sections"
+  :tag "Customized queries section (see docstring for details)"
+  :type
+  `(list :tag ""
+ (const :tag "" notmuch-hello-insert-query-list)
+ (string :tag "Title for this section")
+ (repeat :tag "Queries"
+ (cons (string :tag "Name") (string :tag "Query")))
+ (plist :inline t :options ,notmuch-custom-section-options)))
+
+(defcustom notmuch-hello-sections
+  (list #'notmuch-hello-insert-header
+ #'notmuch-hello-insert-saved-searches
+ #'notmuch-hello-insert-search
+ #'notmuch-hello-insert-recent-searches
+ #'notmuch-hello-insert-alltags
+ #'notmuch-hello-insert-footer)
+  "Sections for notmuch-hello.
+
+Each entry of this list should be a function of no arguments that
+should return if `notmuch-hello-target' is produced as part of its
+output and nil otherwise. For convenience an element can also be
+a list of the form (FUNC ARG1 ARG2 .. ARGN) in which case FUNC
+will be applied to the rest of the list.
+
+The functions will be run to construct the content of the
+notmuch-hello buffer in the order they appear in this list. A
+section should not end with an empty line, because a newline will
+be inserted after each section by `notmuch-hello'.
+
+A \"Customized tag-list\" item in the customize-interface
+displays a list of all tags, optionally hiding some of them. It
+is also possible to filter the list of messages matching each tag
+by an additional filter query. Similarly, the count of messages
+displayed next to the buttons can be generated by applying a
+different filter to the tag query. These filters are also
+supported for \"Customized queries section\" items."
+  :group 'notmuch
+  :type
+  '(repeat
+    (choice (function-item notmuch-hello-insert-header)
+    (function-item notmuch-hello-insert-saved-searches)
+    (function-item notmuch-hello-insert-search)
+    (function-item notmuch-hello-insert-recent-searches)
+    (function-item notmuch-hello-insert-alltags)
+    (function-item notmuch-hello-insert-footer)
+    (function-item notmuch-hello-insert-inbox)
+    notmuch-hello-tags-section
+    notmuch-hello-query-section
+    (function :tag "Custom function"))))
+
+(defvar notmuch-hello-target nil
+  "Button at position of point before rebuilding the notmuch-buffer
+
+This variable contains the string of the button, if any, the
+point was positioned at before the notmuch-hello buffer was
+rebuilt. This is never actually set globally and defined as a
+defvar only for documentation purposes and to avoid a compiler
+warning about it occurring as a free variable.")
+
+(defvar notmuch-hello-hidden-sections nil
+  "List of query section titles whose contents are hidden")
+
+(defvar notmuch-hello-first-run t)
+
 (defun notmuch-hello-remember-search (search)
   (if (not (member search notmuch-hello-recent-searches))
       (push search notmuch-hello-recent-searches))
@@ -173,8 +256,8 @@ Typically \",\" in the US and UK and \".\" in Europe."
     (message "Saved '%s' as '%s'." search name)
     (notmuch-hello-update)))
 
-(defun notmuch-hello-longest-label (tag-alist)
-  (or (loop for elem in tag-alist
+(defun notmuch-hello-longest-label (searches-alist)
+  (or (loop for elem in searches-alist
     maximize (length (car elem)))
       0))
 
@@ -238,12 +321,71 @@ should be. Returns a cons cell `(tags-per-line width)'."
    (* tags-per-line (+ 9 1))))
    tags-per-line))))
 
-(defun notmuch-hello-insert-tags (tag-alist widest target)
-  (let* ((tags-and-width (notmuch-hello-tags-per-line widest))
+(defun notmuch-hello-filtered-query (query filter)
+  "Constructs a query to search all messages matching QUERY and FILTER.
+
+If FILTER is a string, it is directly used in the returned query.
+
+If FILTER is a function, it is called with QUERY as a parameter and
+the string it returns is used as the filter.
+
+Otherwise, FILTER is ignored.
+"
+  (cond
+   ((functionp filter)
+    (let ((result (funcall filter query)))
+      (and result (concat query " and (" result ")"))))
+   ((stringp filter)
+    (concat query " and (" filter ")"))
+   (t (concat query))))
+
+(defun notmuch-hello-query-counts (query-alist &rest options)
+  "Compute list of counts of matched messages from QUERY-ALIST.
+
+QUERY-ALIST must be a list containing elements of the form (NAME . QUERY)
+or (NAME QUERY COUNT-QUERY). If the latter form is used,
+COUNT-QUERY specifies an alternate query to be used to generate
+the count for the associated query.
+
+The result is the list of elements of the form (NAME QUERY COUNT).
+
+The values :show-empty-searches, :filter and :filter-count from
+options will be handled as specified for
+`notmuch-hello-insert-searches'."
+  (notmuch-remove-if-not
+   #'identity
+   (mapcar
+    (lambda (elem)
+      (let* ((name (car elem))
+     (query-and-count (if (consp (cdr elem))
+  ;; do we have a different query for the message count?
+  (cons (second elem) (third elem))
+ (cons (cdr elem) (cdr elem))))
+     (message-count
+      (string-to-number
+       (notmuch-saved-search-count
+ (notmuch-hello-filtered-query (cdr query-and-count)
+      (or (plist-get options :filter-count)
+ (plist-get options :filter)))))))
+ (and (or (plist-get options :show-empty-searches) (> message-count 0))
+   (list name (notmuch-hello-filtered-query
+       (car query-and-count) (plist-get options :filter))
+ message-count))))
+    query-alist)))
+
+(defun notmuch-hello-insert-buttons (searches)
+  "Insert buttons for SEARCHES.
+
+SEARCHES must be a list containing lists of the form (NAME QUERY COUNT), where
+QUERY is the query to start when the button for the corresponding entry is
+activated. COUNT should be the number of messages matching the query.
+Such a list can be computed with `notmuch-hello-query-counts'."
+  (let* ((widest (notmuch-hello-longest-label searches))
+ (tags-and-width (notmuch-hello-tags-per-line widest))
  (tags-per-line (car tags-and-width))
  (widest (cdr tags-and-width))
  (count 0)
- (reordered-list (notmuch-hello-reflect tag-alist tags-per-line))
+ (reordered-list (notmuch-hello-reflect searches tags-per-line))
  ;; Hack the display of the buttons used.
  (widget-push-button-prefix "")
  (widget-push-button-suffix "")
@@ -253,13 +395,13 @@ should be. Returns a cons cell `(tags-per-line width)'."
     (mapc (lambda (elem)
     ;; (not elem) indicates an empty slot in the matrix.
     (when elem
-      (let* ((name (car elem))
-     (query (cdr elem))
+      (let* ((name (first elem))
+     (query (second elem))
+     (count (third elem))
      (formatted-name (format "%s " name)))
  (widget-insert (format "%8s "
-       (notmuch-hello-nice-number
- (string-to-number (notmuch-saved-search-count query)))))
- (if (string= formatted-name target)
+       (notmuch-hello-nice-number count)))
+ (if (string= formatted-name notmuch-hello-target)
     (setq found-target-pos (point-marker)))
  (widget-create 'push-button
        :notify #'notmuch-hello-widget-search
@@ -277,7 +419,7 @@ should be. Returns a cons cell `(tags-per-line width)'."
     (setq count (1+ count))
     (if (eq (% count tags-per-line) 0)
  (widget-insert "\n")))
-  reordered-list)
+  searches)
 
     ;; If the last line was not full (and hence did not include a
     ;; carriage return), insert one now.
@@ -325,59 +467,275 @@ should be. Returns a cons cell `(tags-per-line width)'."
 (fset 'notmuch-hello-mode-map notmuch-hello-mode-map)
 
 (defun notmuch-hello-mode ()
- "Major mode for convenient notmuch navigation. This is your entry portal into notmuch.
+  "Major mode for convenient notmuch navigation. This is your entry portal into notmuch.
 
 Complete list of currently available key bindings:
 
 \\{notmuch-hello-mode-map}"
- (interactive)
- (kill-all-local-variables)
- (use-local-map notmuch-hello-mode-map)
- (setq major-mode 'notmuch-hello-mode
-       mode-name "notmuch-hello")
- ;;(setq buffer-read-only t)
-)
-
-(defun notmuch-hello-generate-tag-alist ()
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map notmuch-hello-mode-map)
+  (setq major-mode 'notmuch-hello-mode
+ mode-name "notmuch-hello"))
+
+(defun notmuch-hello-generate-tag-alist (&optional hide-tags filter-query filter-count)
   "Return an alist from tags to queries to display in the all-tags section."
   (notmuch-remove-if-not
-   #'cdr
+   #'identity
    (mapcar (lambda (tag)
-     (cons tag
-   (cond
-    ((functionp notmuch-hello-tag-list-make-query)
-     (concat "tag:" tag " and ("
-     (funcall notmuch-hello-tag-list-make-query tag) ")"))
-    ((stringp notmuch-hello-tag-list-make-query)
-     (concat "tag:" tag " and ("
-     notmuch-hello-tag-list-make-query ")"))
-    (t (concat "tag:" tag)))))
+     (let ((query (notmuch-hello-filtered-query (concat "tag:" tag)
+ filter-query)))
+       (when query
+ (if filter-count
+     (list tag (notmuch-hello-filtered-query tag filter-query)
+   (notmuch-hello-filtered-query (concat "tag:" tag)
+ filter-count))
+   (cons tag (notmuch-hello-filtered-query
+      (concat "tag:" tag) filter-query))))))
    (notmuch-remove-if-not
     (lambda (tag)
-      (not (member tag notmuch-hello-hide-tags)))
+      (not (member tag hide-tags)))
     (process-lines notmuch-command "search-tags")))))
 
+(defun notmuch-hello-insert-header ()
+  "Insert the default notmuch-hello header."
+  (when notmuch-show-logo
+    (let ((image notmuch-hello-logo))
+      ;; The notmuch logo uses transparency. That can display poorly
+      ;; when inserting the image into an emacs buffer (black logo on
+      ;; a black background), so force the background colour of the
+      ;; image. We use a face to represent the colour so that
+      ;; `defface' can be used to declare the different possible
+      ;; colours, which depend on whether the frame has a light or
+      ;; dark background.
+      (setq image (cons 'image
+ (append (cdr image)
+ (list :background (face-background 'notmuch-hello-logo-background)))))
+      (insert-image image))
+    (widget-insert "  "))
+
+  (widget-insert "Welcome to ")
+  ;; Hack the display of the links used.
+  (let ((widget-link-prefix "")
+ (widget-link-suffix ""))
+    (widget-create 'link
+   :notify (lambda (&rest ignore)
+     (browse-url notmuch-hello-url))
+   :help-echo "Visit the notmuch website."
+   "notmuch")
+    (widget-insert ". ")
+    (widget-insert "You have ")
+    (widget-create 'link
+   :notify (lambda (&rest ignore)
+     (notmuch-hello-update))
+   :help-echo "Refresh"
+   (notmuch-hello-nice-number
+    (string-to-number (car (process-lines notmuch-command "count")))))
+    (widget-insert " messages.\n")))
+
+
+(defun notmuch-hello-insert-saved-searches ()
+  "Insert the saved-searches section."
+  (let ((searches (notmuch-hello-query-counts
+  notmuch-saved-searches
+  :show-empty-searches notmuch-show-empty-saved-searches))
+ found-target-pos final-target-pos)
+    (when searches
+      (widget-insert "Saved searches: ")
+      (widget-create 'push-button
+     :notify (lambda (&rest ignore)
+       (customize-variable 'notmuch-saved-searches))
+     "edit")
+      (widget-insert "\n\n")
+      (setq final-target-pos (point-marker))
+      (let ((start (point)))
+ (setq found-target-pos
+      (notmuch-hello-insert-buttons searches))
+ (if found-target-pos
+    (setq final-target-pos found-target-pos))
+ (indent-rigidly start (point) notmuch-hello-indent)
+ final-target-pos))))
+
+(defun notmuch-hello-insert-search ()
+  "Insert a search widget."
+  (widget-insert "Search: ")
+  (setq notmuch-hello-search-bar-marker (point-marker))
+  (widget-create 'editable-field
+ ;; Leave some space at the start and end of the
+ ;; search boxes.
+ :size (max 8 (- (window-width) notmuch-hello-indent
+ (length "Search: ")))
+ :action (lambda (widget &rest ignore)
+   (notmuch-hello-search (widget-value widget))))
+  (insert "\n"))
+
+(defun notmuch-hello-insert-recent-searches ()
+  "Insert recent searches."
+  (when notmuch-hello-recent-searches
+    (widget-insert "Recent searches: ")
+    (widget-create 'push-button
+   :notify (lambda (&rest ignore)
+     (setq notmuch-hello-recent-searches nil)
+     (notmuch-hello-update))
+   "clear")
+    (widget-insert "\n\n")
+    (let ((start (point))
+  (nth 0))
+      (mapc '(lambda (search)
+       (let ((widget-symbol (intern (format "notmuch-hello-search-%d" nth))))
+ (set widget-symbol
+      (widget-create 'editable-field
+     ;; Don't let the search boxes be
+     ;; less than 8 characters wide.
+     :size (max 8
+ (- (window-width)
+   ;; Leave some space
+   ;; at the start and
+   ;; end of the
+   ;; boxes.
+   (* 2 notmuch-hello-indent)
+   ;; 1 for the space
+   ;; before the
+   ;; `[save]' button. 6
+   ;; for the `[save]'
+   ;; button.
+   1 6))
+     :action (lambda (widget &rest ignore)
+       (notmuch-hello-search (widget-value widget)))
+     search))
+ (widget-insert " ")
+ (widget-create 'push-button
+ :notify (lambda (widget &rest ignore)
+  (notmuch-hello-add-saved-search widget))
+ :notmuch-saved-search-widget widget-symbol
+ "save"))
+       (widget-insert "\n")
+       (setq nth (1+ nth)))
+    notmuch-hello-recent-searches)
+      (indent-rigidly start (point) notmuch-hello-indent))))
+
+(defun notmuch-hello-insert-searches (title query-alist &rest options)
+  "Insert a section with TITLE showing a list of buttons made from QUERY-ALIST.
+
+QUERY-ALIST must be a list containing elements of the form (NAME . QUERY)
+or (NAME QUERY COUNT-QUERY). If the latter form is used,
+COUNT-QUERY specifies an alternate query to be used to generate
+the count for the associated item.
+
+Supports the following entries in OPTIONS as a plist:
+:initially-hidden - if non-nil, section will be hidden on startup
+:show-empty-searches - show buttons with no matching messages
+:hide-if-empty - hide if no buttons would be shown
+   (only makes sense without :show-empty-searches)
+:filter - This can be a function that takes the search query as its argument and
+    returns a filter to be used in conjuction with the query for that search or nil
+    to hide the element. This can also be a string that is used as a combined with
+    each query using \"and\".
+:filter-count - Separate filter to generate the count displayed each search. Accepts
+    the same values as :filter. If :filter and :filter-count are specified, this
+    will be used instead of :filter, not in conjunction with it."
+  (widget-insert title ": ")
+  (if (and notmuch-hello-first-run (plist-get options :initially-hidden))
+      (add-to-list 'notmuch-hello-hidden-sections title))
+  (let ((is-hidden (member title notmuch-hello-hidden-sections))
+ (start (point)))
+    (if is-hidden
+ (widget-create 'push-button
+       :notify `(lambda (widget &rest ignore)
+  (setq notmuch-hello-hidden-sections
+ (delete ,title notmuch-hello-hidden-sections))
+  (notmuch-hello-update))
+       "show")
+      (widget-create 'push-button
+     :notify `(lambda (widget &rest ignore)
+ (add-to-list 'notmuch-hello-hidden-sections
+     ,title)
+ (notmuch-hello-update))
+     "hide"))
+    (widget-insert "\n")
+    (let (target-pos
+  (searches (apply 'notmuch-hello-query-counts query-alist options)))
+      (when (and (not is-hidden)
+       (or (not (plist-get options :hide-if-empty))
+  searches))
+ (widget-insert "\n")
+ (setq target-pos
+      (notmuch-hello-insert-buttons searches))
+ (indent-rigidly start (point) notmuch-hello-indent)
+ target-pos))))
+
+(defun notmuch-hello-insert-tags-section (&optional title &rest options)
+  "Insert a section displaying all tags and message counts for each.
+
+TITLE defaults to \"All tags\".
+Allowed options are those accepted by `notmuch-hello-insert-searches' and the
+following:
+
+:hide-tags - List of tags that should be excluded."
+  (apply 'notmuch-hello-insert-searches
+ (or title "All tags")
+ (notmuch-hello-generate-tag-alist
+  (plist-get options :hide-tags)
+  (plist-get options :filter)
+  (plist-get options :filter-count))
+ options))
+
+(defun notmuch-hello-insert-inbox ()
+  "Show an entry for each saved search and inboxed messages for each tag"
+  (notmuch-hello-insert-searches "What's in your inbox"
+ (append
+  (notmuch-saved-searches)
+  (notmuch-hello-generate-tag-alist))
+ :filter "tag:inbox"))
+
+(defun notmuch-hello-insert-alltags ()
+  "Insert a section displaying all tags and associated message counts"
+  (notmuch-hello-insert-tags-section
+   nil
+   :initially-hidden (not notmuch-show-all-tags-list)
+   :filter notmuch-hello-tag-list-make-query))
+
+(defun notmuch-hello-insert-footer ()
+  "Insert the notmuch-hello footer."
+  (let ((start (point)))
+    (widget-insert "Type a search query and hit RET to view matching threads.\n")
+    (when notmuch-hello-recent-searches
+      (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n")
+      (widget-insert "Save recent searches with the `save' button.\n"))
+    (when notmuch-saved-searches
+      (widget-insert "Edit saved searches with the `edit' button.\n"))
+    (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n")
+    (widget-insert "`=' refreshes this screen. `s' jumps to the search box. `q' to quit.\n")
+    (widget-create 'link
+   :notify (lambda (&rest ignore)
+     (customize-variable 'notmuch-hello-sections))
+   :button-prefix "" :button-suffix ""
+   "Customize")
+    (widget-insert " this page.\n")
+    (let ((fill-column (- (window-width) notmuch-hello-indent)))
+      (center-region start (point)))))
+
 ;;;###autoload
 (defun notmuch-hello (&optional no-display)
   "Run notmuch and display saved searches, known tags, etc."
   (interactive)
 
-  ; Jump through a hoop to get this value from the deprecated variable
-  ; name (`notmuch-folders') or from the default value.
+ ; Jump through a hoop to get this value from the deprecated variable
+ ; name (`notmuch-folders') or from the default value.
   (if (not notmuch-saved-searches)
-    (setq notmuch-saved-searches (notmuch-saved-searches)))
+      (setq notmuch-saved-searches (notmuch-saved-searches)))
 
   (if no-display
       (set-buffer "*notmuch-hello*")
     (switch-to-buffer "*notmuch-hello*"))
 
-  (let ((target (if (widget-at)
-   (widget-value (widget-at))
- (condition-case nil
-     (progn
-       (widget-forward 1)
-       (widget-value (widget-at)))
-   (error nil)))))
+  (let ((notmuch-hello-target (if (widget-at)
+  (widget-value (widget-at))
+ (condition-case nil
+    (progn
+      (widget-forward 1)
+      (widget-value (widget-at)))
+  (error nil)))))
 
     (kill-all-local-variables)
     (let ((inhibit-read-only t))
@@ -391,167 +749,31 @@ Complete list of currently available key bindings:
       (mapc 'delete-overlay (car all))
       (mapc 'delete-overlay (cdr all)))
 
-    (when notmuch-show-logo
-      (let ((image notmuch-hello-logo))
- ;; The notmuch logo uses transparency. That can display poorly
- ;; when inserting the image into an emacs buffer (black logo on
- ;; a black background), so force the background colour of the
- ;; image. We use a face to represent the colour so that
- ;; `defface' can be used to declare the different possible
- ;; colours, which depend on whether the frame has a light or
- ;; dark background.
- (setq image (cons 'image
-  (append (cdr image)
-  (list :background (face-background 'notmuch-hello-logo-background)))))
- (insert-image image))
-      (widget-insert "  "))
-
-    (widget-insert "Welcome to ")
-    ;; Hack the display of the links used.
-    (let ((widget-link-prefix "")
-  (widget-link-suffix ""))
-      (widget-create 'link
-     :notify (lambda (&rest ignore)
-       (browse-url notmuch-hello-url))
-     :help-echo "Visit the notmuch website."
-     "notmuch")
-      (widget-insert ". ")
-      (widget-insert "You have ")
-      (widget-create 'link
-     :notify (lambda (&rest ignore)
-       (notmuch-hello-update))
-     :help-echo "Refresh"
-     (notmuch-hello-nice-number
-      (string-to-number (car (process-lines notmuch-command "count")))))
-      (widget-insert " messages.\n"))
-
-    (let ((found-target-pos nil)
-  (final-target-pos nil))
-      (let* ((saved-alist
-      ;; Filter out empty saved searches if required.
-      (if notmuch-show-empty-saved-searches
-  notmuch-saved-searches
- (loop for elem in notmuch-saved-searches
-      if (> (string-to-number (notmuch-saved-search-count (cdr elem))) 0)
-      collect elem)))
-     (saved-widest (notmuch-hello-longest-label saved-alist))
-     (alltags-alist (if notmuch-show-all-tags-list (notmuch-hello-generate-tag-alist)))
-     (alltags-widest (notmuch-hello-longest-label alltags-alist))
-     (widest (max saved-widest alltags-widest)))
-
- (when saved-alist
-  (widget-insert "\nSaved searches: ")
-  (widget-create 'push-button
- :notify (lambda (&rest ignore)
-   (customize-variable 'notmuch-saved-searches))
- "edit")
-  (widget-insert "\n\n")
-  (setq final-target-pos (point-marker))
-  (let ((start (point)))
-    (setq found-target-pos (notmuch-hello-insert-tags saved-alist widest target))
-    (if found-target-pos
- (setq final-target-pos found-target-pos))
-    (indent-rigidly start (point) notmuch-hello-indent)))
-
- (widget-insert "\nSearch: ")
- (setq notmuch-hello-search-bar-marker (point-marker))
- (widget-create 'editable-field
-       ;; Leave some space at the start and end of the
-       ;; search boxes.
-       :size (max 8 (- (window-width) notmuch-hello-indent
-       (length "Search: ")))
-       :action (lambda (widget &rest ignore)
- (notmuch-hello-search (widget-value widget))))
- (widget-insert "\n")
-
- (when notmuch-hello-recent-searches
-  (widget-insert "\nRecent searches: ")
-  (widget-create 'push-button
- :notify (lambda (&rest ignore)
-   (setq notmuch-hello-recent-searches nil)
-   (notmuch-hello-update))
- "clear")
-  (widget-insert "\n\n")
-  (let ((start (point))
- (nth 0))
-    (mapc '(lambda (search)
-     (let ((widget-symbol (intern (format "notmuch-hello-search-%d" nth))))
-       (set widget-symbol
-    (widget-create 'editable-field
-       ;; Don't let the search boxes be
-       ;; less than 8 characters wide.
-       :size (max 8
-  (- (window-width)
-     ;; Leave some space
-     ;; at the start and
-     ;; end of the
-     ;; boxes.
-     (* 2 notmuch-hello-indent)
-     ;; 1 for the space
-     ;; before the
-     ;; `[save]' button. 6
-     ;; for the `[save]'
-     ;; button.
-     1 6))
-       :action (lambda (widget &rest ignore)
- (notmuch-hello-search (widget-value widget)))
-       search))
-       (widget-insert " ")
-       (widget-create 'push-button
-      :notify (lambda (widget &rest ignore)
- (notmuch-hello-add-saved-search widget))
-      :notmuch-saved-search-widget widget-symbol
-      "save"))
-     (widget-insert "\n")
-     (setq nth (1+ nth)))
-  notmuch-hello-recent-searches)
-    (indent-rigidly start (point) notmuch-hello-indent)))
-
- (when alltags-alist
-  (widget-insert "\nAll tags: ")
-  (widget-create 'push-button
- :notify (lambda (widget &rest ignore)
-   (setq notmuch-show-all-tags-list nil)
-   (notmuch-hello-update))
- "hide")
-  (widget-insert "\n\n")
-  (let ((start (point)))
-    (setq found-target-pos (notmuch-hello-insert-tags alltags-alist widest target))
-    (if (not final-target-pos)
- (setq final-target-pos found-target-pos))
-    (indent-rigidly start (point) notmuch-hello-indent)))
-
- (widget-insert "\n")
-
- (if (not notmuch-show-all-tags-list)
-    (widget-create 'push-button
-   :notify (lambda (widget &rest ignore)
-     (setq notmuch-show-all-tags-list t)
-     (notmuch-hello-update))
-   "Show all tags")))
-
-      (let ((start (point)))
- (widget-insert "\n\n")
- (widget-insert "Type a search query and hit RET to view matching threads.\n")
- (when notmuch-hello-recent-searches
-  (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n")
-  (widget-insert "Save recent searches with the `save' button.\n"))
- (when notmuch-saved-searches
-  (widget-insert "Edit saved searches with the `edit' button.\n"))
- (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n")
- (widget-insert "`=' refreshes this screen. `s' jumps to the search box. `q' to quit.\n")
- (let ((fill-column (- (window-width) notmuch-hello-indent)))
-  (center-region start (point))))
+    (let (final-target-pos)
+      (mapc
+       (lambda (section)
+ (let ((point-before (point))
+       (result (if (functionp section)
+   (funcall section)
+ (apply (car section) (cdr section)))))
+   (if (and (not final-target-pos) (integer-or-marker-p result))
+       (setq final-target-pos result))
+   ;; don't insert a newline when the previous section didn't show
+   ;; anything.
+   (unless (eq (point) point-before)
+     (widget-insert "\n"))))
+       notmuch-hello-sections)
 
       (widget-setup)
-
+      
       (when final-target-pos
  (goto-char final-target-pos)
  (unless (widget-at)
   (widget-forward 1)))
-
+      
       (unless (widget-at)
- (notmuch-hello-goto-search)))))
+ (notmuch-hello-goto-search)))
+    (setq notmuch-hello-first-run nil)))
 
 (defun notmuch-folder ()
   "Deprecated function for invoking notmuch---calling `notmuch' is preferred now."
--
1.7.6.3

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe-2]

From: Daniel Schoepe <[hidden email]>

---
 test/emacs                                         |   37 ++++++++++++++++++++
 test/emacs.expected-output/notmuch-hello           |    4 ++-
 .../notmuch-hello-new-section                      |    4 ++
 .../notmuch-hello-no-saved-searches                |    4 ++-
 .../notmuch-hello-section-counts                   |    5 +++
 .../notmuch-hello-section-hidden-tag               |    4 ++
 .../notmuch-hello-section-with-empty               |    4 ++
 .../emacs.expected-output/notmuch-hello-with-empty |    4 ++-
 8 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 test/emacs.expected-output/notmuch-hello-new-section
 create mode 100644 test/emacs.expected-output/notmuch-hello-section-counts
 create mode 100644 test/emacs.expected-output/notmuch-hello-section-hidden-tag
 create mode 100644 test/emacs.expected-output/notmuch-hello-section-with-empty

diff --git a/test/emacs b/test/emacs
index 0303d7d..15854ae 100755
--- a/test/emacs
+++ b/test/emacs
@@ -29,6 +29,43 @@ test_emacs '(let ((notmuch-saved-searches
       (test-output))'
 test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-no-saved-searches
 
+test_begin_subtest "User defined section with inbox tag"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-searches
+                                     \"Test\" '((\"inbox\" . \"tag:inbox\")))))))
+           (notmuch-hello)
+           (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-new-section
+
+test_begin_subtest "User defined section with empty, hidden entry"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-searches
+                                     \"Test-with-empty\"
+                                     '((\"inbox\" . \"tag:inbox\")
+                                       (\"doesnotexist\" . \"tag:doesnotexist\"))
+                                     :hide-empty-searches t)))))
+             (notmuch-hello)
+             (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-with-empty
+
+test_begin_subtest "User defined section, unread tag filtered out"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-tags-section
+                                     \"Test-with-filtered\"
+                                     :hide-tags '(\"unread\"))))))
+             (notmuch-hello)
+             (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-hidden-tag
+
+test_begin_subtest "User defined section, different query for counts"
+test_emacs "(let ((notmuch-hello-sections
+                   (list (lambda () (notmuch-hello-insert-tags-section
+                                     \"Test-with-counts\"
+                                     :filter-count \"tag:signed\")))))
+             (notmuch-hello)
+             (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-counts
+
 test_begin_subtest "Basic notmuch-search view in emacs"
 test_emacs '(notmuch-search "tag:inbox")
     (notmuch-test-wait)
diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello
index 64b7e42..fd512d3 100644
--- a/test/emacs.expected-output/notmuch-hello
+++ b/test/emacs.expected-output/notmuch-hello
@@ -6,9 +6,11 @@ Saved searches: [edit]
 
 Search:                                                                    
 
-[Show all tags]
+All tags: [show]
 
  Type a search query and hit RET to view matching threads.
  Edit saved searches with the `edit' button.
   Hit RET or click on a saved search or tag name to view matching threads.
     `=' refreshes this screen. `s' jumps to the search box. `q' to quit.
+    Customize this page.
+
diff --git a/test/emacs.expected-output/notmuch-hello-new-section b/test/emacs.expected-output/notmuch-hello-new-section
new file mode 100644
index 0000000..be7b26a
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-new-section
@@ -0,0 +1,4 @@
+Test: [hide]
+
+  50 inbox  
+
diff --git a/test/emacs.expected-output/notmuch-hello-no-saved-searches b/test/emacs.expected-output/notmuch-hello-no-saved-searches
index 7f8206a..37b2303 100644
--- a/test/emacs.expected-output/notmuch-hello-no-saved-searches
+++ b/test/emacs.expected-output/notmuch-hello-no-saved-searches
@@ -2,9 +2,11 @@
 
 Search:                                                                    
 
-[Show all tags]
+All tags: [show]
 
  Type a search query and hit RET to view matching threads.
  Edit saved searches with the `edit' button.
   Hit RET or click on a saved search or tag name to view matching threads.
     `=' refreshes this screen. `s' jumps to the search box. `q' to quit.
+    Customize this page.
+
diff --git a/test/emacs.expected-output/notmuch-hello-section-counts b/test/emacs.expected-output/notmuch-hello-section-counts
new file mode 100644
index 0000000..12d19ed
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-section-counts
@@ -0,0 +1,5 @@
+Test-with-counts: [hide]
+
+   2 attachment             7 inbox                  7 signed          
+   7 unread          
+
diff --git a/test/emacs.expected-output/notmuch-hello-section-hidden-tag b/test/emacs.expected-output/notmuch-hello-section-hidden-tag
new file mode 100644
index 0000000..eb21c07
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-section-hidden-tag
@@ -0,0 +1,4 @@
+Test-with-filtered: [hide]
+
+   4 attachment            50 inbox                  7 signed          
+
diff --git a/test/emacs.expected-output/notmuch-hello-section-with-empty b/test/emacs.expected-output/notmuch-hello-section-with-empty
new file mode 100644
index 0000000..4481dca
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-section-with-empty
@@ -0,0 +1,4 @@
+Test-with-empty: [hide]
+
+  50 inbox  
+
diff --git a/test/emacs.expected-output/notmuch-hello-with-empty b/test/emacs.expected-output/notmuch-hello-with-empty
index a9ed630..220fac4 100644
--- a/test/emacs.expected-output/notmuch-hello-with-empty
+++ b/test/emacs.expected-output/notmuch-hello-with-empty
@@ -6,9 +6,11 @@ Saved searches: [edit]
 
 Search:                                                                    
 
-[Show all tags]
+All tags: [show]
 
  Type a search query and hit RET to view matching threads.
  Edit saved searches with the `edit' button.
   Hit RET or click on a saved search or tag name to view matching threads.
     `=' refreshes this screen. `s' jumps to the search box. `q' to quit.
+    Customize this page.
+
--
1.7.6.3

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Michal Sojka]

On Mon, 10 Oct 2011, Daniel Schoepe wrote:
> Fixed that and rebased against master.

Hi Daniel,

I've an improvement for your patches. Recently, I decided to speed up
notmuch hello startup times and I found that hiding a section does not
eliminate the execution of "notmuch count" commands for buttons in the
hidden section. The following patch (applies on top of v5) should fix
it. Now I can enjoy blazingly fast notmuch startup, because I have only
one section shown. :-)

Another improvement could be the addition of [hide] button for saved
searches sections.

Cheers,
-Michal

--8<---------------cut here---------------start------------->8---
The result is that hello screen shows much faster when some sections are
hidden.
---
 emacs/notmuch-hello.el |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 1f51281..9dcd0f9 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -653,16 +653,16 @@ Supports the following entries in OPTIONS as a plist:
  (notmuch-hello-update))
      "hide"))
     (widget-insert "\n")
-    (let (target-pos
-  (searches (apply 'notmuch-hello-query-counts query-alist options)))
-      (when (and (not is-hidden)
-       (or (not (plist-get options :hide-if-empty))
-  searches))
- (widget-insert "\n")
- (setq target-pos
-      (notmuch-hello-insert-buttons searches))
- (indent-rigidly start (point) notmuch-hello-indent)
- target-pos))))
+    (let (target-pos)
+      (when (not is-hidden)
+ (let ((searches (apply 'notmuch-hello-query-counts query-alist options)))
+  (when (or (not (plist-get options :hide-if-empty))
+    searches)
+    (widget-insert "\n")
+    (setq target-pos
+  (notmuch-hello-insert-buttons searches))
+    (indent-rigidly start (point) notmuch-hello-indent))))
+      target-pos)))
 
 (defun notmuch-hello-insert-tags-section (&optional title &rest options)
   "Insert a section displaying all tags and message counts for each.
--
1.7.5.4

--8<---------------cut here---------------end--------------->8---
_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[David Bremner-2]

On Mon, 10 Oct 2011 15:39:41 +0200, Daniel Schoepe <[hidden email]> wrote:
> From: Daniel Schoepe <[hidden email]>
>
> This patch makes the notmuch-hello screen fully customizable
> by allowing the user to add and remove arbitrary sections. It
> also provides some convenience functions for constructing sections,
> e.g. showing the unread message count for each tag.
>

Yow, that is a big patch, I think it needs some more review.

d
_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Daniel Schoepe-2]

On Thu, 24 Nov 2011 09:54:50 -0400, David Bremner <[hidden email]> wrote:

> On Mon, 10 Oct 2011 15:39:41 +0200, Daniel Schoepe <[hidden email]> wrote:
> > From: Daniel Schoepe <[hidden email]>
> >
> > This patch makes the notmuch-hello screen fully customizable
> > by allowing the user to add and remove arbitrary sections. It
> > also provides some convenience functions for constructing sections,
> > e.g. showing the unread message count for each tag.
> >
>
> Yow, that is a big patch, I think it needs some more review.

Yes; Unfortunately I didn't manage to come up with good partitioning
into smaller patches, because the changes are quite interconnected.

Is there something I can do to help with the review?

I think there's also one performance improvement written by Michal
Sojka, that isn't included in this version yet, but since patches are
getting applied more timely now, I guess that can be merged afterwards.

Cheers,
Daniel

_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch

[Michal Sojka]

On Thu, 24 Nov 2011, Daniel Schoepe wrote:

> On Thu, 24 Nov 2011 09:54:50 -0400, David Bremner <[hidden email]> wrote:
> > On Mon, 10 Oct 2011 15:39:41 +0200, Daniel Schoepe <[hidden email]> wrote:
> > > From: Daniel Schoepe <[hidden email]>
> > >
> > > This patch makes the notmuch-hello screen fully customizable
> > > by allowing the user to add and remove arbitrary sections. It
> > > also provides some convenience functions for constructing sections,
> > > e.g. showing the unread message count for each tag.
> > >
> >
> > Yow, that is a big patch, I think it needs some more review.

I use this patch on a daily basis. There is probably some space for
improvements, especially in the coding style, but I'd like to see a more
experience elisp hacker than me looking at it.

> Yes; Unfortunately I didn't manage to come up with good partitioning
> into smaller patches, because the changes are quite interconnected.
>
> Is there something I can do to help with the review?
>
> I think there's also one performance improvement written by Michal
> Sojka, that isn't included in this version yet,

Yes, that's true. I'm aware of one bug in this improvement. I usually
start notmuch by

  emacsclient -c -a '' -e "(notmuch)"

and the bug is that sometimes the emacs window disappear immediately
after appearing. This did not happen without this improvement and I
guess it is caused by some unexpected return value, perhaps in the code
which determines the initial position of the point.

Cheers,
-Michal
_______________________________________________
notmuch mailing list
[hidden email]
http://notmuchmail.org/mailman/listinfo/notmuch