X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=85e03e89052f864f30dda52badb1fdac1ec6c39e;hb=63b8a2b9af798dc9f47769e2a0c26bdb53ea16cd;hp=57a52151362f78cb81eaa0101cdea8aa185c0e24;hpb=6c0621962a7990d15da50d38300ad9fd07e97592;p=notmuch diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 57a52151..85e03e89 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -30,9 +30,9 @@ (require 'notmuch-lib) (require 'notmuch-query) (require 'notmuch-wash) +(require 'notmuch-mua) (declare-function notmuch-call-notmuch-process "notmuch" (&rest args)) -(declare-function notmuch-reply "notmuch" (query-string)) (declare-function notmuch-fontify-headers "notmuch" nil) (declare-function notmuch-select-tag-with-completion "notmuch" (prompt &rest search-terms)) (declare-function notmuch-search-show-thread "notmuch" nil) @@ -42,6 +42,11 @@ that if this order is changed the headers shown when a message is collapsed will change.") +(defcustom notmuch-show-headers-visible nil + "Should the headers be visible by default?" + :group 'notmuch + :type 'boolean) + (defvar notmuch-show-markup-headers-hook '(notmuch-show-colour-headers) "A list of functions called to decorate the headers listed in `notmuch-show-headers'.") @@ -204,53 +209,69 @@ message at DEPTH in the current thread." (narrow-to-region start (point-max)) (run-hooks 'notmuch-show-markup-headers-hook))))) -(defun notmuch-show-insert-part-header (content-type declared-type &optional name) - (let ((start (point))) - ;; XXX dme: Make this a more useful button (save the part, display - ;; external, etc.) - (insert "[ " - (if name (concat name ": ") "") - declared-type - (if (not (string-equal declared-type content-type)) - (concat " (as " content-type ")") - "") - " ]\n") - (overlay-put (make-overlay start (point)) 'face 'bold))) +(define-button-type 'notmuch-show-part-button-type + 'action 'notmuch-show-part-button-action + 'follow-link t + 'face 'message-mml) + +(defun notmuch-show-insert-part-header (nth content-type declared-type &optional name) + (insert-button + (concat "[ " + (if name (concat name ": ") "") + declared-type + (if (not (string-equal declared-type content-type)) + (concat " (as " content-type ")") + "") + " ]\n") + :type 'notmuch-show-part-button-type + :notmuch-part nth + :notmuch-filename name)) ;; Functions handling particular MIME parts. -(defun notmuch-show-mm-display-part-inline (part content-type) - "Use the mm-decode/mm-view functions to display a part inline, if possible." - (let ((handle (mm-make-handle nil (list content-type)))) - (if (and (mm-inlinable-p handle) - (mm-inlined-p handle)) - (progn - (insert (with-temp-buffer - (let ((display-buffer (current-buffer))) - (with-temp-buffer - (let ((work-buffer (current-buffer))) - (insert (plist-get part :content)) - (set-buffer display-buffer) - (mm-display-part (mm-make-handle work-buffer - (list content-type))) - (buffer-string)))))) - t))) - nil) - -(defun notmuch-show-insert-part-text/plain (part content-type nth depth declared-type) +(defun notmuch-show-save-part (message-id nth &optional filename) + (with-temp-buffer + ;; Always acquires the part via `notmuch part', even if it is + ;; available in the JSON output. + (insert (notmuch-show-get-bodypart-internal message-id nth)) + (let ((file (read-file-name + "Filename to save as: " + (or mailcap-download-directory "~/") + nil nil + filename)) + (require-final-newline nil) + (coding-system-for-write 'no-conversion)) + (write-region (point-min) (point-max) file)))) + +(defun notmuch-show-mm-display-part-inline (msg part content-type content) + "Use the mm-decode/mm-view functions to display a part in the +current buffer, if possible." + (let ((display-buffer (current-buffer))) + (with-temp-buffer + (insert content) + (let ((handle (mm-make-handle (current-buffer) (list content-type)))) + (set-buffer display-buffer) + (if (and (mm-inlinable-p handle) + (mm-inlined-p handle)) + (progn + (mm-display-part handle) + t) + nil))))) + +(defun notmuch-show-insert-part-text/plain (msg part content-type nth depth declared-type) (let ((start (point))) ;; If this text/plain part is not the first part in the message, ;; insert a header to make this clear. (if (> nth 1) - (notmuch-show-insert-part-header declared-type content-type (plist-get part :filename))) - (insert (plist-get part :content)) + (notmuch-show-insert-part-header nth declared-type content-type (plist-get part :filename))) + (insert (notmuch-show-get-bodypart-content msg part nth)) (save-excursion (save-restriction (narrow-to-region start (point-max)) (run-hook-with-args 'notmuch-show-insert-text/plain-hook depth)))) t) -(defun notmuch-show-insert-part-application/octet-stream (part content-type nth depth declared-type) +(defun notmuch-show-insert-part-application/octet-stream (msg part content-type nth depth declared-type) ;; If we can deduce a MIME type from the filename of the attachment, ;; do so and pass it on to the handler for that type. (if (plist-get part :filename) @@ -266,11 +287,12 @@ message at DEPTH in the current thread." nil)) nil)))) -(defun notmuch-show-insert-part-*/* (part content-type nth depth declared-type) - (notmuch-show-insert-part-header content-type declared-type (plist-get part :filename)) - ;; If we have the content for the part, attempt to inline it. - (if (plist-get part :content) - (notmuch-show-mm-display-part-inline part content-type)) +(defun notmuch-show-insert-part-*/* (msg part content-type nth depth declared-type) + ;; This handler _must_ succeed - it is the handler of last resort. + (notmuch-show-insert-part-header nth content-type declared-type (plist-get part :filename)) + (let ((content (notmuch-show-get-bodypart-content msg part nth))) + (if content + (notmuch-show-mm-display-part-inline msg part content-type content))) t) ;; Functions for determining how to handle MIME parts. @@ -293,30 +315,46 @@ message at DEPTH in the current thread." (intern (concat "notmuch-show-insert-part-" content-type)))) result)) +;; Helper for parts which are generally not included in the default +;; JSON output. + +(defun notmuch-show-get-bodypart-internal (message-id part-number) + (with-temp-buffer + (let ((coding-system-for-read 'no-conversion)) + (call-process notmuch-command nil t nil + "part" (format "--part=%s" part-number) message-id) + (buffer-string)))) + +(defun notmuch-show-get-bodypart-content (msg part nth) + (or (plist-get part :content) + (notmuch-show-get-bodypart-internal (concat "id:" (plist-get msg :id)) nth))) + ;; -(defun notmuch-show-insert-bodypart-internal (part content-type nth depth declared-type) +(defun notmuch-show-insert-bodypart-internal (msg part content-type nth depth declared-type) (let ((handlers (notmuch-show-handlers-for content-type))) ;; Run the content handlers until one of them returns a non-nil ;; value. (while (and handlers - (not (funcall (car handlers) part content-type nth depth declared-type))) + (not (funcall (car handlers) msg part content-type nth depth declared-type))) (setq handlers (cdr handlers)))) t) -(defun notmuch-show-insert-bodypart (part depth) +(defun notmuch-show-insert-bodypart (msg part depth) "Insert the body part PART at depth DEPTH in the current thread." (let ((content-type (downcase (plist-get part :content-type))) (nth (plist-get part :id))) - (notmuch-show-insert-bodypart-internal part content-type nth depth content-type)) + (notmuch-show-insert-bodypart-internal msg part content-type nth depth content-type)) + ;; Some of the body part handlers leave point somewhere up in the + ;; part, so we make sure that we're down at the end. + (goto-char (point-max)) ;; Ensure that the part ends with a carriage return. (if (not (bolp)) - (insert "\n")) - ) + (insert "\n"))) -(defun notmuch-show-insert-body (body depth) +(defun notmuch-show-insert-body (msg body depth) "Insert the body BODY at depth DEPTH in the current thread." - (mapc '(lambda (part) (notmuch-show-insert-bodypart part depth)) body)) + (mapc '(lambda (part) (notmuch-show-insert-bodypart msg part depth)) body)) (defun notmuch-show-make-symbol (type) (make-symbol (concat "notmuch-show-" type))) @@ -355,7 +393,7 @@ message at DEPTH in the current thread." (setq headers-end (point-marker)) (setq body-start (point-marker)) - (notmuch-show-insert-body (plist-get msg :body) depth) + (notmuch-show-insert-body msg (plist-get msg :body) depth) ;; Ensure that the body ends with a newline. (if (not (bolp)) (insert "\n")) @@ -383,8 +421,8 @@ message at DEPTH in the current thread." ;; the content). (notmuch-show-set-message-properties msg) - ;; Headers are hidden by default. - (notmuch-show-headers-visible msg nil) + ;; Set header visibility. + (notmuch-show-headers-visible msg notmuch-show-headers-visible) ;; Message visibility depends on whether it matched the search ;; criteria. @@ -437,8 +475,8 @@ function is used. " (save-excursion (let* ((basic-args (list thread-id)) (args (if query-context - (append basic-args (list "and (" query-context ")")) - basic-args))) + (append (list "\'") basic-args (list "and (" query-context ")\'")) + (append (list "\'") basic-args (list "\'"))))) (notmuch-show-insert-forest (notmuch-query-get-threads args)) ;; If the query context reduced the results to nothing, run ;; the basic query. @@ -474,7 +512,7 @@ function is used. " (define-key map (kbd "M-TAB") 'notmuch-show-previous-button) (define-key map (kbd "TAB") 'notmuch-show-next-button) (define-key map "s" 'notmuch-search) - (define-key map "m" 'message-mail) + (define-key map "m" 'notmuch-mua-mail) (define-key map "f" 'notmuch-show-forward-message) (define-key map "r" 'notmuch-show-reply) (define-key map "|" 'notmuch-show-pipe-message) @@ -493,6 +531,7 @@ function is used. " (define-key map "p" 'notmuch-show-previous-open-message) (define-key map (kbd "DEL") 'notmuch-show-rewind) (define-key map " " 'notmuch-show-advance-and-archive) + (define-key map (kbd "M-RET") 'notmuch-show-open-or-close-all) (define-key map (kbd "RET") 'notmuch-show-toggle-message) map) "Keymap for \"notmuch show\" buffers.") @@ -771,20 +810,22 @@ any effects from previous calls to (defun notmuch-show-reply () "Reply to the current message." (interactive) - (notmuch-reply (notmuch-show-get-message-id))) + (notmuch-mua-reply (notmuch-show-get-message-id))) (defun notmuch-show-forward-message () "Forward the current message." (interactive) (with-current-notmuch-show-message - (message-forward))) + (notmuch-mua-forward-message))) (defun notmuch-show-next-message () "Show the next message." (interactive) - (notmuch-show-goto-message-next) - (notmuch-show-mark-read) - (notmuch-show-message-adjust)) + (if (notmuch-show-goto-message-next) + (progn + (notmuch-show-mark-read) + (notmuch-show-message-adjust)) + (goto-char (point-max)))) (defun notmuch-show-previous-message () "Show the previous message." @@ -796,10 +837,14 @@ any effects from previous calls to (defun notmuch-show-next-open-message () "Show the next message." (interactive) - (while (and (notmuch-show-goto-message-next) - (not (notmuch-show-message-visible-p)))) - (notmuch-show-mark-read) - (notmuch-show-message-adjust)) + (let (r) + (while (and (setq r (notmuch-show-goto-message-next)) + (not (notmuch-show-message-visible-p)))) + (if r + (progn + (notmuch-show-mark-read) + (notmuch-show-message-adjust)) + (goto-char (point-max))))) (defun notmuch-show-previous-open-message () "Show the previous message." @@ -867,6 +912,18 @@ to stdout or stderr will appear in the *Messages* buffer." (not (plist-get props :message-visible)))) (force-window-update)) +(defun notmuch-show-open-or-close-all () + "Set the visibility all of the messages in the current thread. +By default make all of the messages visible. With a prefix +argument, hide all of the messages." + (interactive) + (save-excursion + (goto-char (point-min)) + (loop do (notmuch-show-message-visible (notmuch-show-get-message-properties) + (not current-prefix-arg)) + until (not (notmuch-show-goto-message-next)))) + (force-window-update)) + (defun notmuch-show-next-button () "Advance point to the next button in the buffer." (interactive) @@ -955,6 +1012,15 @@ buffer." (interactive) (notmuch-show-do-stash (notmuch-show-get-to))) +;; Commands typically bound to buttons. + +(defun notmuch-show-part-button-action (button) + (let ((nth (button-get button :notmuch-part))) + (if nth + (notmuch-show-save-part (notmuch-show-get-message-id) nth + (button-get button :notmuch-filename)) + (message "Not a valid part (is it a fake part?).")))) + ;; (provide 'notmuch-show)