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

* mu4e-headers.el: add mu4e-headers-search-edit, some cleanups

Browse Source
This commit is contained in:
djcb
2012-05-06 16:55:14 +03:00
parent 9e6802993f
commit 1d4464dffb
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
emacs/mu4e-headers.el
View File

@ -274,14 +274,14 @@ after the end of the search results."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; headers-mode and mode-map ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; headers-mode and mode-map ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defvar mu4e-headers-mode-map nil (defvar mu4e-headers-mode-map nil
"Keymap for *mu4e-headers* buffers.") "Keymap for *mu4e-headers* buffers.")
(unless mu4e-headers-mode-map (unless mu4e-headers-mode-map
;; add some quick funcs so our key descriptions below are shorter ;; add some quick funcs so our key descriptions below are shorter
;; TODO: defmacro this
(defun mu4e~headers-mark-trash()(interactive)(mu4e-headers-mark-and-next 'trash)) (defun mu4e~headers-mark-trash()(interactive)(mu4e-headers-mark-and-next 'trash))
(defun mu4e~headers-mark-delete()(interactive)(mu4e-headers-mark-and-next 'delete)) (defun mu4e~headers-mark-delete()(interactive)(mu4e-headers-mark-and-next 'delete))
(defun mu4e~headers-mark-unmark()(interactive)(mu4e-headers-mark-and-next 'unmark)) (defun mu4e~headers-mark-unmark()(interactive)(mu4e-headers-mark-and-next 'unmark))
@ -293,6 +293,9 @@ after the end of the search results."
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))
(define-key map "s" 'mu4e-headers-search) (define-key map "s" 'mu4e-headers-search)
(define-key map "S" 'mu4e-headers-search-edit)
(define-key map "/" 'mu4e-headers-search-narrow)
(define-key map "b" 'mu4e-headers-search-bookmark) (define-key map "b" 'mu4e-headers-search-bookmark)
(define-key map "B" 'mu4e-headers-search-bookmark-edit) (define-key map "B" 'mu4e-headers-search-bookmark-edit)
@ -303,13 +306,10 @@ after the end of the search results."
(define-key map "r" 'mu4e-headers-rerun-search) (define-key map "r" 'mu4e-headers-rerun-search)
(define-key map "g" 'mu4e-headers-rerun-search) ;; for compatibility (define-key map "g" 'mu4e-headers-rerun-search) ;; for compatibility
(define-key map "/" 'mu4e-headers-search-refine)
(define-key map "%" 'mu4e-headers-mark-matches) (define-key map "%" 'mu4e-headers-mark-matches)
(define-key map "t" 'mu4e-headers-mark-subthread) (define-key map "t" 'mu4e-headers-mark-subthread)
(define-key map "T" 'mu4e-headers-mark-thread) (define-key map "T" 'mu4e-headers-mark-thread)
;; navigation ;; navigation
(define-key map "n" 'mu4e-headers-next) (define-key map "n" 'mu4e-headers-next)
(define-key map "p" 'mu4e-headers-prev) (define-key map "p" 'mu4e-headers-prev)
@ -735,6 +735,13 @@ EXPR, let the user edit the query before executing it."
(mu4e-mark-handle-when-leaving) (mu4e-mark-handle-when-leaving)
(mu4e~headers-search-execute expr (or search-all current-prefix-arg)))) (mu4e~headers-search-execute expr (or search-all current-prefix-arg))))
(defun mu4e-headers-search-edit (search-all)
"Edit the last search expression. If SEARCH-ALL (prefix-argument)
is non-nil, retrieve *all* results, otherwise only get up to
`mu4e-search-results-limit'."
(interactive "P")
(mu4e-headers-search mu4e~headers-query search-all nil t))
(defun mu4e-headers-search-bookmark (&optional expr search-all edit) (defun mu4e-headers-search-bookmark (&optional expr search-all edit)
"Search using some bookmarked query EXPR. When SEARCH-ALL (prefix "Search using some bookmarked query EXPR. When SEARCH-ALL (prefix
@ -754,21 +761,21 @@ the bookmark before starting the search."
(mu4e-headers-search-bookmark nil current-prefix-arg t)) (mu4e-headers-search-bookmark nil current-prefix-arg t))
(defun mu4e-headers-search-refine (extra search-all) (defun mu4e-headers-search-narrow (filter search-all)
"Do a search based on the last search with clause EXTRA "Narrow the last search by appending search expression FILTER to
appended. SEARCH-ALL (prefix-argument) determines whether to run the last search expression. If SEARCH-ALL (prefix-argument) is
*all* results or only up to `mu4e-search-results-limit'. You can non-nil, retrieve *all* results, otherwise only get up to
use this function to 'filter', 'zoom in' to your search results." `mu4e-search-results-limit'."
(interactive (interactive
(let ((extra (let ((filter
(read-string (mu4e-format "Filter result: ") (read-string (mu4e-format "Filter: ")
nil 'mu4e~headers-search-hist nil t)) nil 'mu4e~headers-search-hist nil t))
(search-all current-prefix-arg)) (search-all current-prefix-arg))
(list extra search-all))) (list filter search-all)))
(unless mu4e~headers-query (unless mu4e~headers-query
(error "There's nothing to filter")) (error "There's nothing to filter"))
(mu4e-headers-search (mu4e-headers-search
(format "(%s) AND %s" mu4e~headers-query extra) search-all)) (format "(%s) AND %s" mu4e~headers-query filter) search-all))