Add notmuch-message.el to emacs/Makefile.local

[notmuch] / emacs / notmuch-hello.el

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 50d89110e5c50611aae7900397ce048cd10119b0..6a1c56e52b341c045a5ff038da79dbf556dd1ecb 100644 (file)
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -118,23 +118,24 @@
   (+ (/ dividend divisor)
      (if (> (% dividend divisor) 0) 1 0)))
 
-(defun notmuch-hello-reflect (list width)
-  "Reflect a `width' wide matrix represented by `list' along the
+(defun notmuch-hello-reflect-generate-row (ncols nrows row list)
+  (let ((len (length list)))
+    (loop for col from 0 to (- ncols 1)
+         collect (let ((offset (+ (* nrows col) row)))
+                   (if (< offset len)
+                       (nth offset list)
+                     ;; Don't forget to insert an empty slot in the
+                     ;; output matrix if there is no corresponding
+                     ;; value in the input matrix.
+                     nil)))))
+
+(defun notmuch-hello-reflect (list ncols)
+  "Reflect a `ncols' wide matrix represented by `list' along the
 diagonal."
   ;; Not very lispy...
-  (let* ((len (length list))
-        (nrows (notmuch-hello-roundup len width)))
+  (let ((nrows (notmuch-hello-roundup (length list) ncols)))
     (loop for row from 0 to (- nrows 1)
-         append (loop for col from 0 to (- width 1)
-                      ;; How could we calculate the offset just once
-                      ;; per inner-loop?
-                      if (< (+ (* nrows col) row) len)
-                      collect (nth (+ (* nrows col) row) list)
-                      else
-                      ;; Don't forget to insert an empty slot in the
-                      ;; output matrix if there is no corresponding
-                      ;; value in the input matrix.
-                      collect nil))))
+         append (notmuch-hello-reflect-generate-row ncols nrows row list))))
 
 (defun notmuch-hello-widget-search (widget &rest ignore)
   (notmuch-search (widget-get widget
@@ -179,10 +180,10 @@ diagonal."
                ;; can just insert `(- widest (length name))' spaces -
                ;; the column separator is included in the button if
                ;; `(equal widest (length name)'.
-               (widget-insert (make-string (- widest (length name)) ? )))
-             (setq count (1+ count))
-             (if (eq (% count tags-per-line) 0)
-                 (widget-insert "\n"))))
+               (widget-insert (make-string (- widest (length name)) ? ))))
+           (setq count (1+ count))
+           (if (eq (% count tags-per-line) 0)
+               (widget-insert "\n")))
          reordered-list)
 
     ;; If the last line was not full (and hence did not include a
@@ -284,8 +285,9 @@ diagonal."
                      if (> (string-to-number (notmuch-saved-search-count (cdr elem))) 0)
                      collect elem)))
             (saved-widest (notmuch-hello-longest-label saved-alist))
-            (alltags-alist (mapcar '(lambda (tag) (cons tag (concat "tag:" tag)))
-                                   (process-lines notmuch-command "search-tags")))
+            (alltags-alist (if notmuch-show-all-tags-list
+                               (mapcar '(lambda (tag) (cons tag (concat "tag:" tag)))
+                                       (process-lines notmuch-command "search-tags"))))
             (alltags-widest (notmuch-hello-longest-label alltags-alist))
             (widest (max saved-widest alltags-widest)))
 
@@ -360,26 +362,27 @@ diagonal."
            (indent-rigidly start (point) notmuch-hello-indent)))
 
        (when alltags-alist
-         (if notmuch-show-all-tags-list
-             (progn
-               (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")
+         (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"))))
+                          "Show all tags")))
 
       (let ((start (point)))
        (widget-insert "\n\n")