notmuch-show: add optional argument for query context instead of using global binding...

[notmuch] / notmuch.el

diff --git a/notmuch.el b/notmuch.el
index c504f46de22aa89a3a3c68faf75db530f7b7205d..d180fa4e51ba04f7ed7d9ba4df2a81e0a021f125 100644 (file)
--- a/notmuch.el
+++ b/notmuch.el
@@ -637,52 +637,29 @@ which this thread was originally shown."
                     (goto-char end))))))
       (forward-line))))
 
-(defun notmuch-show-markup-part (beg end depth mime-message)
+(defun notmuch-show-markup-part (beg end depth)
   (if (re-search-forward notmuch-show-part-begin-regexp nil t)
       (progn
-        (if (eq mime-message nil)
-            (let ((filename (notmuch-show-get-filename)))
-              (with-temp-buffer
-                (insert-file-contents filename nil nil nil t)
-                (setq mime-message (mm-dissect-buffer)))))
        (forward-line)
-       (let ((part-beg (point-marker)))
+       (let ((beg (point-marker)))
          (re-search-forward notmuch-show-part-end-regexp)
-
-         (let ((part-end (copy-marker (match-beginning 0))))
-           (goto-char part-end)
+         (let ((end (copy-marker (match-beginning 0))))
+           (goto-char end)
            (if (not (bolp))
                (insert "\n"))
-           (indent-rigidly part-beg part-end depth)
-            (save-excursion
-              (goto-char part-beg)
-              (forward-line -1)
-              (beginning-of-line)
-              (let ((handle-type (mm-handle-type mime-message))
-                    mime-type)
-                (if (sequencep (car handle-type))
-                    (setq mime-type (car handle-type))
-                  (setq mime-type (car (car (cdr handle-type))))
-                  )
-                (if (equal mime-type "text/html")
-                    (mm-display-part mime-message))))
-
-           (notmuch-show-markup-citations-region part-beg part-end depth)
+           (indent-rigidly beg end depth)
+           (notmuch-show-markup-citations-region beg end depth)
            ; Advance to the next part (if any) (so the outer loop can
            ; determine whether we've left the current message.
            (if (re-search-forward notmuch-show-part-begin-regexp nil t)
                (beginning-of-line)))))
-    (goto-char end))
-  mime-message)
+    (goto-char end)))
 
 (defun notmuch-show-markup-parts-region (beg end depth)
   (save-excursion
     (goto-char beg)
-    (let (mime-message)
-      (while (< (point) end)
-        (setq mime-message
-              (notmuch-show-markup-part
-               beg end depth mime-message))))))
+    (while (< (point) end)
+      (notmuch-show-markup-part beg end depth))))
 
 (defun notmuch-show-markup-body (depth match btn)
   "Markup a message body, (indenting, buttonizing citations,
@@ -949,15 +926,17 @@ All currently available key bindings:
          (lambda()
            (hl-line-mode 1) ))
 
-(defun notmuch-show (thread-id &optional parent-buffer)
+(defun notmuch-show (thread-id &optional parent-buffer query-context)
   "Run \"notmuch show\" with the given thread ID and display results.
 
 The optional PARENT-BUFFER is the notmuch-search buffer from
 which this notmuch-show command was executed, (so that the next
-thread from that buffer can be show when done with this one)."
+thread from that buffer can be show when done with this one).
+
+The optional QUERY-CONTEXT is a notmuch search term. Only messages from the thread 
+matching this search term are shown if non-nil. "
   (interactive "sNotmuch show: ")
-  (let ((query notmuch-search-query-string)
-       (buffer (get-buffer-create (concat "*notmuch-show-" thread-id "*"))))
+  (let ((buffer (get-buffer-create (concat "*notmuch-show-" thread-id "*"))))
     (switch-to-buffer buffer)
     (notmuch-show-mode)
     (set (make-local-variable 'notmuch-show-parent-buffer) parent-buffer)
@@ -969,7 +948,9 @@ thread from that buffer can be show when done with this one)."
       (erase-buffer)
       (goto-char (point-min))
       (save-excursion
-       (call-process notmuch-command nil t nil "show" "--entire-thread" thread-id "and (" query ")")
+       (let* ((basic-args (list notmuch-command nil t nil "show" "--entire-thread" thread-id))
+               (args (if query-context (append basic-args (list "and (" query-context ")")) basic-args)))
+         (apply 'call-process args))
        (notmuch-show-markup-messages)
        )
       (run-hooks 'notmuch-show-hook)
@@ -1133,12 +1114,20 @@ Complete list of currently available key bindings:
   "Return the thread for the current thread"
   (get-text-property (point) 'notmuch-search-thread-id))
 
+(defun notmuch-search-find-authors ()
+  "Return the authors for the current thread"
+  (get-text-property (point) 'notmuch-search-authors))
+
+(defun notmuch-search-find-subject ()
+  "Return the subject for the current thread"
+  (get-text-property (point) 'notmuch-search-subject))
+
 (defun notmuch-search-show-thread ()
   "Display the currently selected thread."
   (interactive)
   (let ((thread-id (notmuch-search-find-thread-id)))
     (if (> (length thread-id) 0)
-       (notmuch-show thread-id (current-buffer))
+       (notmuch-show thread-id (current-buffer) notmuch-search-query-string)
       (error "End of search results"))))
 
 (defun notmuch-search-reply-to-thread ()
@@ -1257,7 +1246,9 @@ This function advances the next thread when finished."
                      (goto-char (point-max))
                      (let ((beg (point-marker)))
                        (insert (format "%s %-7s %-40s %s (%s)\n" date count authors subject tags))
-                       (put-text-property beg (point-marker) 'notmuch-search-thread-id thread-id))
+                       (put-text-property beg (point-marker) 'notmuch-search-thread-id thread-id)
+                       (put-text-property beg (point-marker) 'notmuch-search-authors authors)
+                       (put-text-property beg (point-marker) 'notmuch-search-subject subject))
                      (set 'line (match-end 0)))
                  (set 'more nil))))))
       (delete-process proc))))