From 636925b40b20c60961660d14e0356f0970e97546 Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Tue, 4 May 2010 14:44:39 +0100 Subject: [PATCH] emacs: Pretty print the numbers of matching messages. Insert a separator every three digits when outputting numbers. Allow the user to choose the separator by customizing `notmuch-decimal-separator'. Widen the space allocated for message counts accordingly. --- emacs/notmuch-hello.el | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index aa270727..f8ae332c 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -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,17 @@ 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))) + (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 +193,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 +205,15 @@ 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))))))) + (+ 9 1 widest))))))) (cons tags-per-line (/ (- (window-width) notmuch-hello-indent - (* tags-per-line (+ 7 1))) + ;; 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 +234,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 @@ -353,7 +376,8 @@ Complete list of currently available key bindings: :notify (lambda (&rest ignore) (notmuch-hello-update)) :help-echo "Refresh" - (car (process-lines notmuch-command "count"))) + (notmuch-hello-nice-number + (string-to-number (car (process-lines notmuch-command "count"))))) (widget-insert " messages (that's not much mail).\n")) (let ((found-target-pos nil) -- 2.26.2