emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

revert: fix(mu4e): reflect upstream naming changes (#5620)

Browse source 
Revert 390fd1a7b0
Ref #5620
This commit is contained in:
Henrik Lissner 2021-10-18 14:53:00 +02:00
parent 6bd7ec7579
commit 3b0eeb104b
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/email/mu4e/autoload/email.el
View file

@ -67,7 +67,7 @@ default/fallback account."
(setq +mu4e--old-wconf (current-window-configuration))
(delete-other-windows)
(switch-to-buffer (doom-fallback-buffer)))
(mu4e--start 'mu4e~main-view)
(mu4e~start 'mu4e~main-view)
;; (save-selected-window
;; (prolusion-mail-show))
)

4
modules/email/mu4e/autoload/mu-lock.el
View file

@ -76,7 +76,7 @@ Else, write to this process' PID to the lock file"
"Handle another process requesting the Mu4e lock."
(when (equal (nth 1 event) 'created)
(when +mu4e-lock-relaxed
(mu4e--stop)
(mu4e~stop)
(file-notify-rm-watch +mu4e-lock--file-watcher)
(message "Someone else wants to use Mu4e, releasing lock")
(delete-file +mu4e-lock-file)
@ -90,4 +90,4 @@ Else, write to this process' PID to the lock file"
(setq +mu4e-lock--file-just-deleted t)
(when (and +mu4e-lock-greedy (+mu4e-lock-available t))
(message "Noticed Mu4e lock was available, grabbed it")
(run-at-time 0.2 nil #'mu4e--start)))))
(run-at-time 0.2 nil #'mu4e~start)))))

10
modules/email/mu4e/config.el
View file

@ -313,7 +313,7 @@ This is enacted by `+mu4e~main-action-str-prettier-a' and
+mu4e-lock-request-file (expand-file-name "~/AppData/Local/Temp/mu4e_lock_request")))
(add-hook 'kill-emacs-hook #'+mu4e-lock-file-delete-maybe)
(advice-add 'mu4e--start :around #'+mu4e-lock-start)
(advice-add 'mu4e~start :around #'+mu4e-lock-start)
(advice-add 'mu4e-quit :after #'+mu4e-lock-file-delete-maybe))
(unless (featurep! +org)
@ -554,7 +554,7 @@ See `+mu4e-msg-gmail-p' and `mu4e-sent-messages-behavior'.")
;;
;; Gmail will handle the rest.
(defun +mu4e--mark-seen (docid _msg target)
(mu4e--server-move docid (mu4e~mark-check-target target) "+S-u-N"))
(mu4e~proc-move docid (mu4e~mark-check-target target) "+S-u-N"))
(defvar +mu4e--last-invalid-gmail-action 0)
@ -571,7 +571,7 @@ See `+mu4e-msg-gmail-p' and `mu4e-sent-messages-behavior'.")
(when (< 2 (- (float-time) +mu4e--last-invalid-gmail-action))
(sit-for 1))
(setq +mu4e--last-invalid-gmail-action (float-time)))
(mu4e--server-remove docid))))
(mu4e~proc-remove docid))))
(alist-get 'trash mu4e-marks)
(list :char '("d" . "▼")
:prompt "dtrash"
@ -579,7 +579,7 @@ See `+mu4e-msg-gmail-p' and `mu4e-sent-messages-behavior'.")
:action (lambda (docid msg target)
(if (+mu4e-msg-gmail-p msg)
(+mu4e--mark-seen docid msg target)
(mu4e--server-move docid (mu4e~mark-check-target target) "+T-N"))))
(mu4e~proc-move docid (mu4e~mark-check-target target) "+T-N"))))
;; Refile will be my "archive" function.
(alist-get 'refile mu4e-marks)
(list :char '("r" . "▼")
@ -588,7 +588,7 @@ See `+mu4e-msg-gmail-p' and `mu4e-sent-messages-behavior'.")
:action (lambda (docid msg target)
(if (+mu4e-msg-gmail-p msg)
(+mu4e--mark-seen docid msg target)
(mu4e--server-move docid (mu4e~mark-check-target target) "-N")))
(mu4e~proc-move docid (mu4e~mark-check-target target) "-N")))
#'+mu4e--mark-seen))
;; This hook correctly modifies gmail flags on emails when they are marked.