emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu4e-main: small cleanups

This commit is contained in:
Dirk-Jan C. Binnema 2023-02-02 23:48:16 +02:00
parent bbea9e5374
commit 66d20d04f5
1 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
mu4e/mu4e-main.el
View File

@ -247,72 +247,72 @@ character of the keyboard shortcut
(defun mu4e--main-redraw () (defun mu4e--main-redraw ()
"Redraw the main buffer if there is one. "Redraw the main buffer if there is one.
Otherwise, do nothing." Otherwise, do nothing."
(when (buffer-live-p (get-buffer mu4e-main-buffer-name)) (when-let* ((buffer (get-buffer mu4e-main-buffer-name))
(with-current-buffer mu4e-main-buffer-name (buffer (and (buffer-live-p buffer) buffer)))
(let* ((inhibit-read-only t) (with-current-buffer buffer
(pos (point)) (let* ((inhibit-read-only t)
(addrs (mu4e-personal-addresses)) (pos (point))
(max-length (seq-reduce (lambda (a b) (addrs (mu4e-personal-addresses))
(max a (length (plist-get b :name)))) (max-length (seq-reduce (lambda (a b)
(mu4e-query-items) 0))) (max a (length (plist-get b :name))))
(erase-buffer) (mu4e-query-items) 0)))
(insert (erase-buffer)
"* " (insert
(propertize "mu4e" 'face 'mu4e-header-key-face) "* "
(propertize " - mu for emacs version " 'face 'mu4e-title-face) (propertize "mu4e" 'face 'mu4e-header-key-face)
(propertize mu4e-mu-version 'face 'mu4e-header-key-face) (propertize " - mu for emacs version " 'face 'mu4e-title-face)
"\n\n" (propertize mu4e-mu-version 'face 'mu4e-header-key-face)
(propertize " Basics\n\n" 'face 'mu4e-title-face) "\n\n"
(mu4e--main-action-str (propertize " Basics\n\n" 'face 'mu4e-title-face)
"\t* [j]ump to some maildir\n" #'mu4e-search-maildir) (mu4e--main-action-str
(mu4e--main-action-str "\t* [j]ump to some maildir\n" #'mu4e-search-maildir)
"\t* enter a [s]earch query\n" #'mu4e-search) (mu4e--main-action-str
(mu4e--main-action-str "\t* enter a [s]earch query\n" #'mu4e-search)
"\t* [C]ompose a new message\n" #'mu4e-compose-new) (mu4e--main-action-str
"\n" "\t* [C]ompose a new message\n" #'mu4e-compose-new)
(propertize " Bookmarks\n\n" 'face 'mu4e-title-face) "\n"
(mu4e--main-items (mu4e-query-items 'bookmarks) ?b max-length) (propertize " Bookmarks\n\n" 'face 'mu4e-title-face)
"\n" (mu4e--main-items (mu4e-query-items 'bookmarks) ?b max-length)
(propertize " Maildirs\n\n" 'face 'mu4e-title-face) "\n"
(mu4e--main-items (mu4e-query-items 'maildirs) ?j max-length) (propertize " Maildirs\n\n" 'face 'mu4e-title-face)
"\n" (mu4e--main-items (mu4e-query-items 'maildirs) ?j max-length)
(propertize " Misc\n\n" 'face 'mu4e-title-face) "\n"
(propertize " Misc\n\n" 'face 'mu4e-title-face)
(mu4e--main-action-str "\t* [;]Switch context\n" #'mu4e-context-switch) (mu4e--main-action-str "\t* [;]Switch context\n" #'mu4e-context-switch)
(mu4e--main-action-str "\t* [U]pdate email & database\n" (mu4e--main-action-str "\t* [U]pdate email & database\n"
#'mu4e-update-mail-and-index) #'mu4e-update-mail-and-index)
;; show the queue functions if `smtpmail-queue-dir' is defined ;; show the queue functions if `smtpmail-queue-dir' is defined
(if (file-directory-p smtpmail-queue-dir) (if (file-directory-p smtpmail-queue-dir)
(mu4e--main-view-queue) (mu4e--main-view-queue)
"") "")
"\n" "\n"
(mu4e--main-action-str "\t* [N]ews\n" #'mu4e-news) (mu4e--main-action-str "\t* [N]ews\n" #'mu4e-news)
(mu4e--main-action-str "\t* [A]bout mu4e\n" #'mu4e-about) (mu4e--main-action-str "\t* [A]bout mu4e\n" #'mu4e-about)
(mu4e--main-action-str "\t* [H]elp\n" #'mu4e-display-manual) (mu4e--main-action-str "\t* [H]elp\n" #'mu4e-display-manual)
(mu4e--main-action-str "\t* [q]uit\n" #'mu4e-quit) (mu4e--main-action-str "\t* [q]uit\n" #'mu4e-quit)
"\n" "\n"
(propertize " Info\n\n" 'face 'mu4e-title-face) (propertize " Info\n\n" 'face 'mu4e-title-face)
(mu4e--key-val "last updated" (mu4e--key-val "last updated"
(current-time-string (current-time-string
(plist-get mu4e-index-update-status :tstamp))) (plist-get mu4e-index-update-status :tstamp)))
(mu4e--key-val "database-path" (mu4e-database-path)) (mu4e--key-val "database-path" (mu4e-database-path))
(mu4e--key-val "maildir" (mu4e-root-maildir)) (mu4e--key-val "maildir" (mu4e-root-maildir))
(mu4e--key-val "in store" (mu4e--key-val "in store"
(format "%d" (plist-get mu4e--server-props :doccount)) (format "%d" (plist-get mu4e--server-props :doccount))
"messages") "messages")
(if mu4e-main-hide-personal-addresses "" (if mu4e-main-hide-personal-addresses ""
(mu4e--key-val "personal addresses" (mu4e--key-val "personal addresses"
(if addrs (mapconcat #'identity addrs ", " ) "none")))) (if addrs (mapconcat #'identity addrs ", " ) "none"))))
(if mu4e-main-hide-personal-addresses "" (if mu4e-main-hide-personal-addresses ""
(unless (mu4e-personal-address-p user-mail-address) (unless (mu4e-personal-address-p user-mail-address)
(mu4e-message (concat (mu4e-message (concat
"Tip: `user-mail-address' ('%s') is not part " "Tip: `user-mail-address' ('%s') is not part "
"of mu's addresses; add it with 'mu init "of mu's addresses; add it with 'mu init
--my-address='") user-mail-address))) --my-address='") user-mail-address)))
(mu4e-main-mode) (mu4e-main-mode)
(goto-char pos))))) (goto-char pos)))))
(defun mu4e--main-view-queue () (defun mu4e--main-view-queue ()
"Display queue-related actions in the main view." "Display queue-related actions in the main view."