X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=contrib%2Fnotmuch-pick%2Fnotmuch-pick.el;h=98750c0317307a38f0915ccde10163247bdce13b;hb=6ae591911c41ca2b2c042e79f545579b2ccd55cb;hp=f7caaa8272d2ea13496d4a89fffcddfe4d69c9fc;hpb=9d2ac59a80ce6ed717d3708983a00255f39626de;p=notmuch diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el index f7caaa82..98750c03 100644 --- a/contrib/notmuch-pick/notmuch-pick.el +++ b/contrib/notmuch-pick/notmuch-pick.el @@ -161,10 +161,6 @@ "A buffer local copy of argument open-target to the function notmuch-pick") (make-variable-buffer-local 'notmuch-pick-open-target) -(defvar notmuch-pick-buffer-name nil - "A buffer local copy of argument buffer-name to the function notmuch-pick") -(make-variable-buffer-local 'notmuch-pick-buffer-name) - (defvar notmuch-pick-message-window nil "The window of the message pane. @@ -217,6 +213,17 @@ FUNC." (defvar notmuch-pick-mode-map (let ((map (make-sparse-keymap))) + (set-keymap-parent map notmuch-common-keymap) + ;; The following override the global keymap. + ;; Override because we want to close message pane first. + (define-key map "?" (notmuch-pick-close-message-pane-and #'notmuch-help)) + ;; Override because we first close message pane and then close pick buffer. + (define-key map "q" 'notmuch-pick-quit) + ;; Override because we close message pane after the search query is entered. + (define-key map "s" 'notmuch-pick-to-search) + ;; Override because we want to close message pane first. + (define-key map "m" (notmuch-pick-close-message-pane-and #'notmuch-mua-new-mail)) + (define-key map [mouse-1] 'notmuch-pick-show-message) ;; these use notmuch-show functions directly (define-key map "|" 'notmuch-show-pipe-message) @@ -231,20 +238,16 @@ FUNC." (define-key map "e" (notmuch-pick-to-message-pane #'notmuch-pick-button-activate)) ;; bindings from show (or elsewhere) but we close the message pane first. - (define-key map "m" (notmuch-pick-close-message-pane-and #'notmuch-mua-new-mail)) (define-key map "f" (notmuch-pick-close-message-pane-and #'notmuch-show-forward-message)) (define-key map "r" (notmuch-pick-close-message-pane-and #'notmuch-show-reply-sender)) (define-key map "R" (notmuch-pick-close-message-pane-and #'notmuch-show-reply)) (define-key map "V" (notmuch-pick-close-message-pane-and #'notmuch-show-view-raw-message)) - (define-key map "?" (notmuch-pick-close-message-pane-and #'notmuch-help)) ;; The main pick bindings - (define-key map "q" 'notmuch-pick-quit) (define-key map "x" 'notmuch-pick-quit) (define-key map "A" 'notmuch-pick-archive-thread) (define-key map "a" 'notmuch-pick-archive-message-then-next) (define-key map "=" 'notmuch-pick-refresh-view) - (define-key map "s" 'notmuch-pick-to-search) (define-key map "z" 'notmuch-pick-to-pick) (define-key map "n" 'notmuch-pick-next-matching-message) (define-key map "p" 'notmuch-pick-prev-matching-message) @@ -590,13 +593,11 @@ message will be \"unarchived\", i.e. the tag changes in (let ((inhibit-read-only t) (basic-query notmuch-pick-basic-query) (query-context notmuch-pick-query-context) - (target (notmuch-pick-get-message-id)) - (buffer-name notmuch-pick-buffer-name)) + (target (notmuch-pick-get-message-id))) (erase-buffer) (notmuch-pick-worker basic-query query-context - target - (get-buffer buffer-name)))) + target))) (defun notmuch-pick-thread-top () (when (notmuch-pick-get-message-properties) @@ -668,16 +669,23 @@ unchanged ADDRESS if parsing fails." ;; If we have a name return that otherwise return the address. (or p-name p-address))) -(defun notmuch-pick-insert-field (field format-string msg) +(defun notmuch-pick-format-field (field format-string msg) + "Format a FIELD of MSG according to FORMAT-STRING and return string" (let* ((headers (plist-get msg :headers)) - (match (plist-get msg :match))) + (match (plist-get msg :match)) + formatted-field) (cond + ((listp field) + (setq formatted-field + (format format-string (notmuch-pick-format-field-list field msg)))) + ((string-equal field "date") (let ((face (if match 'notmuch-pick-match-date-face 'notmuch-pick-no-match-date-face))) - (insert (propertize (format format-string (plist-get msg :date_relative)) - 'face face)))) + (setq formatted-field + (propertize (format format-string (plist-get msg :date_relative)) + 'face face)))) ((string-equal field "subject") (let ((tree-status (plist-get msg :tree-status)) @@ -685,13 +693,14 @@ unchanged ADDRESS if parsing fails." (face (if match 'notmuch-pick-match-subject-face 'notmuch-pick-no-match-subject-face))) - (insert (propertize (format format-string - (concat - (mapconcat #'identity (reverse tree-status) "") - (if (string= notmuch-pick-previous-subject bare-subject) - " ..." - bare-subject))) - 'face face)) + (setq formatted-field + (propertize (format format-string + (concat + (mapconcat #'identity (reverse tree-status) "") + (if (string= notmuch-pick-previous-subject bare-subject) + " ..." + bare-subject))) + 'face face)) (setq notmuch-pick-previous-subject bare-subject))) ((string-equal field "authors") @@ -702,26 +711,34 @@ unchanged ADDRESS if parsing fails." 'notmuch-pick-no-match-author-face))) (when (> (length author) len) (setq author (substring author 0 len))) - (insert (propertize (format format-string author) - 'face face)))) + (setq formatted-field + (propertize (format format-string author) + 'face face)))) ((string-equal field "tags") (let ((tags (plist-get msg :tags)) (face (if match 'notmuch-pick-match-tag-face 'notmuch-pick-no-match-tag-face))) - (when tags - (insert (propertize (format format-string - (mapconcat #'identity tags ", ")) - 'face face)))))))) + (setq formatted-field + (propertize (format format-string + (mapconcat #'identity tags ", ")) + 'face face))))) + formatted-field)) + +(defun notmuch-pick-format-field-list (field-list msg) + "Format fields of MSG according to FIELD-LIST and return string" + (let (result-string) + (dolist (spec field-list result-string) + (let ((field-string (notmuch-pick-format-field (car spec) (cdr spec) msg))) + (setq result-string (concat result-string field-string)))))) (defun notmuch-pick-insert-msg (msg) "Insert the message MSG according to notmuch-pick-result-format" ;; We need to save the previous subject as it will get overwritten ;; by the insert-field calls. (let ((previous-subject notmuch-pick-previous-subject)) - (dolist (spec notmuch-pick-result-format) - (notmuch-pick-insert-field (car spec) (cdr spec) msg)) + (insert (notmuch-pick-format-field-list notmuch-pick-result-format msg)) (notmuch-pick-set-message-properties msg) (notmuch-pick-set-prop :previous-subject previous-subject) (insert "\n"))) @@ -814,6 +831,7 @@ Complete list of currently available key bindings: (interactive) (kill-all-local-variables) + (setq notmuch-buffer-refresh-function #'notmuch-pick-refresh-view) (use-local-map notmuch-pick-mode-map) (setq major-mode 'notmuch-pick-mode mode-name "notmuch-pick") @@ -859,12 +877,15 @@ Complete list of currently available key bindings: (notmuch-sexp-parse-partial-list 'notmuch-pick-insert-forest-thread results-buf))))) -(defun notmuch-pick-worker (basic-query &optional query-context target buffer open-target) +(defun notmuch-pick-worker (basic-query &optional query-context target open-target) + "Insert the actual pick search in the current buffer. + +This is is a helper function for notmuch-pick. The arguments are +the same as for the function notmuch-pick." (interactive) (notmuch-pick-mode) (setq notmuch-pick-basic-query basic-query) (setq notmuch-pick-query-context query-context) - (setq notmuch-pick-buffer-name (buffer-name buffer)) (setq notmuch-pick-target-msg target) (setq notmuch-pick-open-target open-target) @@ -877,7 +898,7 @@ Complete list of currently available key bindings: (if (equal (car (process-lines notmuch-command "count" search-args)) "0") (setq search-args basic-query)) (let ((proc (notmuch-start-notmuch - "notmuch-pick" buffer #'notmuch-pick-process-sentinel + "notmuch-pick" (current-buffer) #'notmuch-pick-process-sentinel "show" "--body=false" "--format=sexp" message-arg search-args)) ;; Use a scratch buffer to accumulate partial output. @@ -902,7 +923,7 @@ The arguments are: BUFFER-NAME: the name of the buffer to show the pick tree. If it is nil \"*notmuch-pick\" followed by QUERY is used. OPEN-TARGET: If TRUE open the target message in the message pane." - (interactive "sNotmuch pick: ") + (interactive) (if (null query) (setq query (notmuch-read-query "Notmuch pick: "))) (let ((buffer (get-buffer-create (generate-new-buffer-name @@ -910,13 +931,13 @@ The arguments are: (concat "*notmuch-pick-" query "*"))))) (inhibit-read-only t)) - (switch-to-buffer buffer) - ;; Don't track undo information for this buffer - (set 'buffer-undo-list t) + (switch-to-buffer buffer)) + ;; Don't track undo information for this buffer + (set 'buffer-undo-list t) - (notmuch-pick-worker query query-context target buffer open-target) + (notmuch-pick-worker query query-context target open-target) - (setq truncate-lines t))) + (setq truncate-lines t)) ;; Set up key bindings from the rest of notmuch.