mu4e: Make :show-target be the identity by default

- This is certainly a better default than crashing
- The user is likely to omit this function in a majority of cases.
This commit is contained in:
Jean-Philippe Bernardy 2014-11-30 23:09:01 +01:00
parent 47fc1b717f
commit 73b87c16f7
1 changed files with 4 additions and 6 deletions

View File

@ -145,7 +145,6 @@ properties are:
:char "r" :char "r"
:prompt "refile" :prompt "refile"
:dyn-target (lambda (target msg) (mu4e-get-refile-folder msg)) :dyn-target (lambda (target msg) (mu4e-get-refile-folder msg))
:show-target (lambda (target) target)
:action (lambda (docid msg target) (mu4e~proc-move docid (mu4e~mark-check-target target) "-N"))) :action (lambda (docid msg target) (mu4e~proc-move docid (mu4e~mark-check-target target) "-N")))
(delete (delete
:char "D" :char "D"
@ -161,7 +160,6 @@ properties are:
:char "m" :char "m"
:prompt "move" :prompt "move"
:ask-target mu4e~mark-get-move-target :ask-target mu4e~mark-get-move-target
:show-target (lambda (target) target)
:action (lambda (docid msg target) (mu4e~proc-move docid (mu4e~mark-check-target target) "-N"))) :action (lambda (docid msg target) (mu4e~proc-move docid (mu4e~mark-check-target target) "-N")))
(read (read
:char "!" :char "!"
@ -172,7 +170,6 @@ properties are:
:char "d" :char "d"
:prompt "dtrash" :prompt "dtrash"
:dyn-target (lambda (target msg) (mu4e-get-trash-folder msg)) :dyn-target (lambda (target msg) (mu4e-get-trash-folder msg))
:show-target (lambda (target) target)
:action (lambda (docid msg target) (mu4e~proc-move docid (mu4e~mark-check-target target) "+T-N"))) :action (lambda (docid msg target) (mu4e~proc-move docid (mu4e~mark-check-target target) "+T-N")))
(unflag (unflag
:char "-" :char "-"
@ -192,12 +189,10 @@ properties are:
(unmark (unmark
:char " " :char " "
:prompt "unmark" :prompt "unmark"
:show-target (lambda (target) nil)
:action (mu4e-error "No action for unmarking")) :action (mu4e-error "No action for unmarking"))
(something (something
:char "*" :char "*"
:prompt "*something" :prompt "*something"
:show-target (lambda (target) "")
:action (mu4e-error "No action for deferred mark")) :action (mu4e-error "No action for deferred mark"))
))) )))
@ -233,7 +228,10 @@ The following marks are available, and the corresponding props:
(markdesc (cdr (or (assq mark mu4e-marks) (mu4e-error "Invalid mark %S" mark)))) (markdesc (cdr (or (assq mark mu4e-marks) (mu4e-error "Invalid mark %S" mark))))
(markkar (plist-get markdesc :char)) (markkar (plist-get markdesc :char))
(target (mu4e~mark-get-dyn-target mark target)) (target (mu4e~mark-get-dyn-target mark target))
(shown-target (funcall (plist-get markdesc :show-target) target))) (show-fct (plist-get markdesc :show-target))
(shown-target (if show-fct
(funcall show-fct target)
target)))
(unless docid (mu4e-warn "No message on this line")) (unless docid (mu4e-warn "No message on this line"))
(unless (eq major-mode 'mu4e-headers-mode) (mu4e-error "Not in headers-mode")) (unless (eq major-mode 'mu4e-headers-mode) (mu4e-error "Not in headers-mode"))
(save-excursion (save-excursion