alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu4e-hdrs.el: restore mark checking when leaving the headers buffer

Browse Source
This commit is contained in:
djcb
2012-04-12 09:01:28 +03:00
parent ec7f865580
commit da0a77343d
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
emacs/mu4e-hdrs.el
View File

@ -676,13 +676,9 @@ action', return nil means 'don't do anything'"
(unless (or (= marknum 0) (eq what 'ignore) (eq what 'apply)) (unless (or (= marknum 0) (eq what 'ignore) (eq what 'apply))
;; if `mu4e-headers-leave-behavior' is not apply or ignore, ask the user ;; if `mu4e-headers-leave-behavior' is not apply or ignore, ask the user
(setq what (setq what
(let ((kar (let ((kar (mu4e-read-option
(read-char "There are existing marks; should we: "
(concat '(("apply marks") ("ignore marks?")))))
"Do you want to "
"[" (propertize "a" 'face 'mu4e-view-link-face) "]pply marks, "
"[" (propertize "i" 'face 'mu4e-view-link-face) "]gnore them, "
"or [" (propertize "c" 'face'mu4e-view-link-face) "]ancel?"))))
(cond (cond
((= kar ?a) 'apply) ((= kar ?a) 'apply)
((= kar ?i) 'ignore) ((= kar ?i) 'ignore)
@ -729,8 +725,9 @@ otherwise, limit to up to `mu4e-search-results-limit'."
(defun mu4e-hdrs-kill-buffer-and-window () (defun mu4e-hdrs-kill-buffer-and-window ()
"Quit the message view and return to the main view." "Quit the message view and return to the main view."
(interactive) (interactive)
(when (mu4e-handle-marks)
(mu4e-kill-buffer-and-window mu4e-hdrs-buffer) (mu4e-kill-buffer-and-window mu4e-hdrs-buffer)
(mu4e-main-view)) (mu4e-main-view)))
(defun mu4e-rerun-search () (defun mu4e-rerun-search ()
"Rerun the search for the last search expression; if none exists, "Rerun the search for the last search expression; if none exists,