mirror of https://github.com/djcb/mu.git
* mu4e: check for marks when auto-updating (don't do it if there are any)
This commit is contained in:
parent
ae44852f80
commit
dc5f27c899
|
@ -655,7 +655,9 @@ after the end of the search results."
|
||||||
"Update the current headers buffer after indexing has brought
|
"Update the current headers buffer after indexing has brought
|
||||||
some changes, `mu4e-headers-auto-update' is non-nil and there is no
|
some changes, `mu4e-headers-auto-update' is non-nil and there is no
|
||||||
user-interaction ongoing."
|
user-interaction ongoing."
|
||||||
(when (and mu4e-headers-auto-update (not (active-minibuffer-window)))
|
(when (and mu4e-headers-auto-update ;; must be set
|
||||||
|
(zerop (mu4e-mark-marks-num)) ;; non active marks
|
||||||
|
(not (active-minibuffer-window))) ;; no user input
|
||||||
(with-current-buffer mu4e~headers-buffer
|
(with-current-buffer mu4e~headers-buffer
|
||||||
(mu4e-headers-rerun-search)))) nil t)
|
(mu4e-headers-rerun-search)))) nil t)
|
||||||
|
|
||||||
|
|
|
@ -302,6 +302,9 @@ If NO-CONFIRMATION is non-nil, don't ask user for confirmation."
|
||||||
(when (gethash docid mu4e~mark-map) t))
|
(when (gethash docid mu4e~mark-map) t))
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
|
(defun mu4e-mark-marks-num ()
|
||||||
|
"Return the number of marks in the current buffer."
|
||||||
|
(if mu4e~mark-map (hash-table-count mu4e~mark-map) 0))
|
||||||
|
|
||||||
(defun mu4e-mark-handle-when-leaving ()
|
(defun mu4e-mark-handle-when-leaving ()
|
||||||
"If there are any marks in the current buffer, handle those
|
"If there are any marks in the current buffer, handle those
|
||||||
|
@ -309,12 +312,12 @@ according to the value of `mu4e-headers-leave-behavior'. This
|
||||||
function is to be called before any further action (like searching,
|
function is to be called before any further action (like searching,
|
||||||
quiting the buffer) is taken; returning t means 'take the following
|
quiting the buffer) is taken; returning t means 'take the following
|
||||||
action', return nil means 'don't do anything'"
|
action', return nil means 'don't do anything'"
|
||||||
(let ((marknum (if mu4e~mark-map (hash-table-count mu4e~mark-map) 0))
|
(let ((marknum (mu4e-mark-marks-num))
|
||||||
(what mu4e-headers-leave-behavior))
|
(what mu4e-headers-leave-behavior))
|
||||||
(unless (zerop marknum) ;; nothing to do?
|
(unless (zerop marknum) ;; nothing to do?
|
||||||
(when (eq what 'ask)
|
(when (eq what 'ask)
|
||||||
(setq what (mu4e-read-option
|
(setq what (mu4e-read-option
|
||||||
"There are existing marks; should we: "
|
(format "There are %d existing mark(s); should we: " marknum)
|
||||||
'( ("apply marks" . apply)
|
'( ("apply marks" . apply)
|
||||||
("ignore marks?" . ignore)))))
|
("ignore marks?" . ignore)))))
|
||||||
;; we determined what to do... now do it
|
;; we determined what to do... now do it
|
||||||
|
|
Loading…
Reference in New Issue