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

mu4e: mu4e-index-updated-hook should not depend on mu4e~contacts

This commit is contained in:
djcb 2018-11-04 13:20:20 +02:00
parent 4e1cfdf668
commit 69ed3498bb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mu4e/mu4e-compose.el
View File

@ -466,7 +466,7 @@ buffers; lets remap its faces so it uses the ones for mu4e."
;; offer completion for e-mail addresses
(when mu4e-compose-complete-addresses
(unless mu4e~contacts ;; work-around for https://github.com/djcb/mu/issues/1016
(mu4e~request-contacts))
(mu4e~request-contacts-maybe))
(mu4e~compose-setup-completion))
(when mu4e-compose-format-flowed
(turn-off-auto-fill)

8
mu4e/mu4e-utils.el
View File

@ -665,8 +665,8 @@ process."
"Indexing completed; processed %d, updated %d, cleaned-up %d"
(plist-get info :processed) (plist-get info :updated)
(plist-get info :cleaned-up))
(unless (or (zerop (plist-get info :updated)) (not mu4e~contacts))
(mu4e~request-contacts)
(unless (zerop (plist-get info :updated))
(mu4e~request-contacts-maybe)
(run-hooks 'mu4e-index-updated-hook)))))
((plist-get info :message)
(mu4e-index-message "%s" (plist-get info :message))))))
@ -849,7 +849,7 @@ Checks whether the server process is live."
(defvar mu4e~get-mail-password-regexp "^Remote: Enter password: $"
"Regexp to match a password query in the `mu4e-get-mail-command' output.")
(defun mu4e~request-contacts ()
(defun mu4e~request-contacts-maybe ()
"If `mu4e-compose-complete-addresses' is non-nil, get/update
the list of contacts we use for autocompletion; otherwise, do
nothing."
@ -898,7 +898,7 @@ successful, call FUNC (if non-nil) afterwards."
(mu4e~proc-ping)
;; maybe request the list of contacts, automatically refresh after
;; reindexing
(mu4e~request-contacts))))
(mu4e~request-contacts-maybe))))
(defun mu4e-clear-caches ()
"Clear any cached resources."