emacs: Allow the user to choose the "From" address when composing a new message

[notmuch] / emacs / notmuch-hello.el

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 02d8f0c4e1ddddeb958a19fb8ba6579ed8f02493..ab06d3a6a9c1937a2183f4bd10d534eed567f22a 100644 (file)
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -19,9 +19,9 @@
 ;;
 ;; Authors: David Edmondson <dme@dme.org>
 
+(eval-when-compile (require 'cl))
 (require 'widget)
 (require 'wid-edit) ; For `widget-forward'.
-(require 'cl)
 
 (require 'notmuch-lib)
 (require 'notmuch-mua)
@@ -91,6 +91,13 @@ So:
          (integer :tag "Number of characters")
          (float :tag "Fraction of window")))
 
+(defcustom notmuch-decimal-separator ","
+  "The string used as a decimal separator.
+
+Typically \",\" in the US and UK and \".\" in Europe."
+  :group 'notmuch
+  :type 'string)
+
 (defvar notmuch-hello-url "http://notmuchmail.org"
   "The `notmuch' web site.")
 
@@ -103,6 +110,18 @@ So:
         notmuch-recent-searches-max)
       (setq notmuch-hello-recent-searches (butlast notmuch-hello-recent-searches))))
 
+(defun notmuch-hello-nice-number (n)
+  (let (result)
+    (while (> n 0)
+      (push (% n 1000) result)
+      (setq n (/ n 1000)))
+    (setq result (or result '(0)))
+    (apply #'concat
+     (number-to-string (car result))
+     (mapcar (lambda (elem)
+             (format "%s%03d" notmuch-decimal-separator elem))
+            (cdr result)))))
+
 (defun notmuch-hello-trim (search)
   "Trim whitespace."
   (if (string-match "^[[:space:]]*\\(.*[^[:space:]]\\)[[:space:]]*$" search)
@@ -175,9 +194,9 @@ should be. Returns a cons cell `(tags-per-line width)'."
          ((integerp notmuch-column-control)
           (max 1
                (/ (- (window-width) notmuch-hello-indent)
-                  ;; Count is 7 wide (6 digits plus space), 1 for the space
+                  ;; Count is 9 wide (8 digits plus space), 1 for the space
                   ;; after the name.
-                  (+ 7 1 (max notmuch-column-control widest)))))
+                  (+ 9 1 (max notmuch-column-control widest)))))
 
          ((floatp notmuch-column-control)
           (let* ((available-width (- (window-width) notmuch-hello-indent))
@@ -187,12 +206,16 @@ should be. Returns a cons cell `(tags-per-line width)'."
          (t
           (max 1
                (/ (- (window-width) notmuch-hello-indent)
-                  ;; Count is 7 wide (6 digits plus space), 1 for the space
+                  ;; Count is 9 wide (8 digits plus space), 1 for the space
                   ;; after the name.
-                  (+ 7 1 widest)))))))
-
-    (cons tags-per-line (/ (- (window-width) notmuch-hello-indent
-                             (* tags-per-line (+ 7 1)))
+                  (+ 9 1 widest)))))))
+
+    (cons tags-per-line (/ (max 1
+                               (- (window-width) notmuch-hello-indent
+                                  ;; Count is 9 wide (8 digits plus
+                                  ;; space), 1 for the space after the
+                                  ;; name.
+                                  (* tags-per-line (+ 9 1))))
                           tags-per-line))))
 
 (defun notmuch-hello-insert-tags (tag-alist widest target)
@@ -213,7 +236,9 @@ should be. Returns a cons cell `(tags-per-line width)'."
              (let* ((name (car elem))
                     (query (cdr elem))
                     (formatted-name (format "%s " name)))
-               (widget-insert (format "%6s " (notmuch-saved-search-count query)))
+               (widget-insert (format "%8s "
+                                      (notmuch-hello-nice-number
+                                       (string-to-number (notmuch-saved-search-count query)))))
                (if (string= formatted-name target)
                    (setq found-target-pos (point-marker)))
                (widget-create 'push-button
@@ -226,7 +251,9 @@ should be. Returns a cons cell `(tags-per-line width)'."
                ;; 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)) ? ))))
+               (widget-insert (make-string (max 1
+                                                (- widest (length name)))
+                                           ? ))))
            (setq count (1+ count))
            (if (eq (% count tags-per-line) 0)
                (widget-insert "\n")))
@@ -262,15 +289,16 @@ should be. Returns a cons cell `(tags-per-line width)'."
 
 
 (defvar notmuch-hello-mode-map
-  (let ((map (copy-keymap widget-keymap)))
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map widget-keymap)
     (define-key map "v" '(lambda () "Display the notmuch version" (interactive)
                            (message "notmuch version %s" (notmuch-version))))
     (define-key map "?" 'notmuch-help)
-    (define-key map "q" 'kill-this-buffer)
+    (define-key map "q" 'notmuch-kill-this-buffer)
     (define-key map "=" 'notmuch-hello-update)
     (define-key map "G" 'notmuch-hello-poll-and-update)
     (define-key map (kbd "<C-tab>") 'widget-backward)
-    (define-key map "m" 'notmuch-mua-mail)
+    (define-key map "m" 'notmuch-mua-new-mail)
     (define-key map "s" 'notmuch-hello-goto-search)
     map)
   "Keymap for \"notmuch hello\" buffers.")
@@ -290,7 +318,9 @@ Complete list of currently available key bindings:
  ;;(setq buffer-read-only t)
 )
 
+;;;###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
@@ -352,8 +382,9 @@ Complete list of currently available key bindings:
                     :notify (lambda (&rest ignore)
                               (notmuch-hello-update))
                     :help-echo "Refresh"
-                    (car (process-lines notmuch-command "count")))
-      (widget-insert " messages (that's not much mail).\n"))
+                    (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))
@@ -485,7 +516,6 @@ Complete list of currently available key bindings:
       (unless (widget-at)
        (notmuch-hello-goto-search)))))
 
-;;;###autoload
 (defun notmuch-folder ()
   "Deprecated function for invoking notmuch---calling `notmuch' is preferred now."
   (interactive)