mu4e: support 'no trash flag' for all mark-for-trash

Use a non-macro implementation for mu4e-(view|headers)-mark-for-trash,
and honor the no-trash flag.

Fixes #1687.
This commit is contained in:
Dirk-Jan C. Binnema
2020-05-16 11:44:48 +03:00
parent a2d315df4c
commit f016f257f9
2 changed files with 8 additions and 18 deletions

View File

@ -873,7 +873,7 @@ FUNC should be a function taking two arguments:
(define-key map "A" (mu4e~native-def mu4e-view-attachment-action))
;; marking/unmarking
(define-key map "d" 'mu4e-view-mark-or-move-to-trash)
(define-key map "d" 'mu4e-view-mark-for-trash)
(define-key map (kbd "<delete>") 'mu4e-view-mark-for-delete)
(define-key map (kbd "<deletechar>") 'mu4e-view-mark-for-delete)
(define-key map (kbd "D") 'mu4e-view-mark-for-delete)
@ -1614,8 +1614,8 @@ list."
(put ',funcname 'definition-name ',mark))))
(mu4e~view-defun-mark-for move)
(mu4e~view-defun-mark-for trash)
(mu4e~view-defun-mark-for refile)
(mu4e~view-defun-mark-for trash)
(mu4e~view-defun-mark-for delete)
(mu4e~view-defun-mark-for flag)
(mu4e~view-defun-mark-for unflag)
@ -1631,13 +1631,6 @@ list."
(mu4e~view-in-headers-context
(mu4e-mark-execute-all)))
(defun mu4e-view-mark-or-move-to-trash (&optional n)
"See `mu4e-headers-mark-or-move-to-trash'."
(interactive "P")
(mu4e~view-in-headers-context
(mu4e-headers-mark-or-move-to-trash)
(mu4e~headers-move (or n 1))))
;;; URL handling
(defun mu4e~view-get-urls-num (prompt &optional multi)