Re: [PATCH v4 08/16] reorganize indexing of multipart/signed and multipart/encrypted

[notmuch-archives.git] / 88 / 114373696bcd3ad700a971af88dc8e6fd60ff7

Return-Path: <dme@dme.org>\r
X-Original-To: notmuch@notmuchmail.org\r
Delivered-To: notmuch@notmuchmail.org\r
Received: from localhost (localhost [127.0.0.1])\r
        by olra.theworths.org (Postfix) with ESMTP id AF0C74048D0\r
        for <notmuch@notmuchmail.org>; Fri, 12 Mar 2010 05:28:52 -0800 (PST)\r
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
X-Spam-Flag: NO\r
X-Spam-Score: -2.317\r
X-Spam-Level: \r
X-Spam-Status: No, score=-2.317 tagged_above=-999 required=5 tests=[AWL=0.282,\r
        BAYES_00=-2.599] autolearn=ham\r
Received: from olra.theworths.org ([127.0.0.1])\r
        by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
        with ESMTP id QS5W53hY8-4t for <notmuch@notmuchmail.org>;\r
        Fri, 12 Mar 2010 05:28:48 -0800 (PST)\r
Received: from mail-bw0-f210.google.com (mail-bw0-f210.google.com\r
        [209.85.218.210])\r
        by olra.theworths.org (Postfix) with ESMTP id 47ABE4048CE\r
        for <notmuch@notmuchmail.org>; Fri, 12 Mar 2010 05:28:47 -0800 (PST)\r
Received: by bwz2 with SMTP id 2so1026802bwz.30\r
        for <notmuch@notmuchmail.org>; Fri, 12 Mar 2010 05:28:46 -0800 (PST)\r
Received: by 10.204.10.3 with SMTP id n3mr897572bkn.81.1268400526097;\r
        Fri, 12 Mar 2010 05:28:46 -0800 (PST)\r
Received: from aw.hh.sledj.net (gmp-ea-fw-1b.sun.com [192.18.8.1])\r
        by mx.google.com with ESMTPS id x16sm5208850bku.17.2010.03.12.05.28.42\r
        (version=TLSv1/SSLv3 cipher=RC4-MD5);\r
        Fri, 12 Mar 2010 05:28:45 -0800 (PST)\r
Received: by aw.hh.sledj.net (Postfix, from userid 1000)\r
        id A9E5D3A0A1; Fri, 12 Mar 2010 13:28:33 +0000 (GMT)\r
To: notmuch@notmuchmail.org\r
From: David Edmondson <dme@dme.org>\r
X-Now-Playing: Attribute (conntype) does not pass the type constraint because:\r
        Validation failed for 'CONNTYPE' failed with value undef at\r
        /home/dme/u/bin/now-playing line 33\r
        main::now_playing() called at /home/dme/u/bin/now-playing line 49\r
Date: Fri, 12 Mar 2010 13:28:33 +0000\r
Message-ID: <876351vfcu.fsf@aw.hh.sledj.net>\r
MIME-Version: 1.0\r
Content-Type: text/plain; charset=utf-8\r
Content-Transfer-Encoding: quoted-printable\r
Subject: [notmuch] [PATCH] Move notmuch-show functionality to notmuch-show.el\r
X-BeenThere: notmuch@notmuchmail.org\r
X-Mailman-Version: 2.1.13\r
Precedence: list\r
List-Id: "Use and development of the notmuch mail system."\r
        <notmuch.notmuchmail.org>\r
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
        <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
List-Post: <mailto:notmuch@notmuchmail.org>\r
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
        <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
X-List-Received-Date: Fri, 12 Mar 2010 13:28:52 -0000\r
\r
To ease the transition to a JSON based implementation of\r
`notmuch-show', move the current implementation into a separate file.\r
\r
Signed-off-by: David Edmondson <dme@dme.org>\r
---\r
 emacs/Makefile.local  |    2 +-\r
 emacs/notmuch-show.el |  982 +++++++++++++++++++++++++++++++++++++++++++++=\r
++++\r
 emacs/notmuch.el      |  960 +--------------------------------------------=\r
---\r
 3 files changed, 984 insertions(+), 960 deletions(-)\r
 create mode 100644 emacs/notmuch-show.el\r
\r
diff --git a/emacs/Makefile.local b/emacs/Makefile.local\r
index 17ede86..6bd8617 100644\r
--- a/emacs/Makefile.local\r
+++ b/emacs/Makefile.local\r
@@ -1,5 +1,5 @@\r
 dir :=3D emacs\r
-emacs_sources :=3D $(dir)/notmuch.el\r
+emacs_sources :=3D $(dir)/notmuch.el $(dir)/notmuch-show.el\r
=20\r
 emacs_bytecode :=3D $(subst .el,.elc,$(emacs_sources))\r
=20\r
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
new file mode 100644\r
index 0000000..dd6343d\r
--- /dev/null\r
+++ b/emacs/notmuch-show.el\r
@@ -0,0 +1,982 @@\r
+;; notmuch-show.el --- display notmuch messages within emacs\r
+;;\r
+;; Copyright =C2=A9 Carl Worth\r
+;;\r
+;; This file is part of Notmuch.\r
+;;\r
+;; Notmuch is free software: you can redistribute it and/or modify it\r
+;; under the terms of the GNU General Public License as published by\r
+;; the Free Software Foundation, either version 3 of the License, or\r
+;; (at your option) any later version.\r
+;;\r
+;; Notmuch is distributed in the hope that it will be useful, but\r
+;; WITHOUT ANY WARRANTY; without even the implied warranty of\r
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+;; General Public License for more details.\r
+;;\r
+;; You should have received a copy of the GNU General Public License\r
+;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.\r
+;;\r
+;; Authors: Carl Worth <cworth@cworth.org>\r
+\r
+;; This is an part of an emacs-based interface to the notmuch mail system.\r
+\r
+(defvar notmuch-show-stash-map\r
+  (let ((map (make-sparse-keymap)))\r
+    (define-key map "c" 'notmuch-show-stash-cc)\r
+    (define-key map "d" 'notmuch-show-stash-date)\r
+    (define-key map "F" 'notmuch-show-stash-filename)\r
+    (define-key map "f" 'notmuch-show-stash-from)\r
+    (define-key map "i" 'notmuch-show-stash-message-id)\r
+    (define-key map "s" 'notmuch-show-stash-subject)\r
+    (define-key map "T" 'notmuch-show-stash-tags)\r
+    (define-key map "t" 'notmuch-show-stash-to)\r
+    map)\r
+  "Submap for stash commands"\r
+  )\r
+\r
+(fset 'notmuch-show-stash-map notmuch-show-stash-map)\r
+\r
+(defvar notmuch-show-mode-map\r
+  (let ((map (make-sparse-keymap)))\r
+    (define-key map "?" 'notmuch-help)\r
+    (define-key map "q" 'kill-this-buffer)\r
+    (define-key map (kbd "C-p") 'notmuch-show-previous-line)\r
+    (define-key map (kbd "C-n") 'notmuch-show-next-line)\r
+    (define-key map (kbd "M-TAB") 'notmuch-show-previous-button)\r
+    (define-key map (kbd "TAB") 'notmuch-show-next-button)\r
+    (define-key map "s" 'notmuch-search)\r
+    (define-key map "m" 'message-mail)\r
+    (define-key map "f" 'notmuch-show-forward-current)\r
+    (define-key map "r" 'notmuch-show-reply)\r
+    (define-key map "|" 'notmuch-show-pipe-message)\r
+    (define-key map "w" 'notmuch-show-save-attachments)\r
+    (define-key map "V" 'notmuch-show-view-raw-message)\r
+    (define-key map "v" 'notmuch-show-view-all-mime-parts)\r
+    (define-key map "c" 'notmuch-show-stash-map)\r
+    (define-key map "b" 'notmuch-show-toggle-current-body)\r
+    (define-key map "h" 'notmuch-show-toggle-current-header)\r
+    (define-key map "-" 'notmuch-show-remove-tag)\r
+    (define-key map "+" 'notmuch-show-add-tag)\r
+    (define-key map "x" 'notmuch-show-archive-thread-then-exit)\r
+    (define-key map "a" 'notmuch-show-archive-thread)\r
+    (define-key map "P" 'notmuch-show-previous-message)\r
+    (define-key map "N" 'notmuch-show-next-message)\r
+    (define-key map "p" 'notmuch-show-previous-open-message)\r
+    (define-key map "n" 'notmuch-show-next-open-message)\r
+    (define-key map (kbd "DEL") 'notmuch-show-rewind)\r
+    (define-key map " " 'notmuch-show-advance-and-archive)\r
+    map)\r
+  "Keymap for \"notmuch show\" buffers.")\r
+(fset 'notmuch-show-mode-map notmuch-show-mode-map)\r
+\r
+(defvar notmuch-show-signature-regexp "\\(-- ?\\|_+\\)$"\r
+  "Pattern to match a line that separates content from signature.\r
+\r
+The regexp can (and should) include $ to match the end of the\r
+line, but should not include ^ to match the beginning of the\r
+line. This is because notmuch may have inserted additional space\r
+for indentation at the beginning of the line. But notmuch will\r
+move past the indentation when testing this pattern, (so that the\r
+pattern can still test against the entire line).")\r
+\r
+(defvar notmuch-show-signature-button-format\r
+  "[ %d-line signature. Click/Enter to toggle visibility. ]"\r
+  "String used to construct button text for hidden signatures\r
+\r
+Can use up to one integer format parameter, i.e. %d")\r
+\r
+(defvar notmuch-show-citation-button-format\r
+  "[ %d more citation lines. Click/Enter to toggle visibility. ]"\r
+  "String used to construct button text for hidden citations.\r
+\r
+Can use up to one integer format parameter, i.e. %d")\r
+\r
+(defvar notmuch-show-signature-lines-max 12\r
+  "Maximum length of signature that will be hidden by default.")\r
+\r
+(defvar notmuch-show-citation-lines-prefix 4\r
+  "Always show at least this many lines of a citation.\r
+\r
+If there is one more line, show that, otherwise collapse\r
+remaining lines into a button.")\r
+\r
+(defvar notmuch-show-message-begin-regexp    "\fmessage{")\r
+(defvar notmuch-show-message-end-regexp      "\fmessage}")\r
+(defvar notmuch-show-header-begin-regexp     "\fheader{")\r
+(defvar notmuch-show-header-end-regexp       "\fheader}")\r
+(defvar notmuch-show-body-begin-regexp       "\fbody{")\r
+(defvar notmuch-show-body-end-regexp         "\fbody}")\r
+(defvar notmuch-show-attachment-begin-regexp "\fattachment{")\r
+(defvar notmuch-show-attachment-end-regexp   "\fattachment}")\r
+(defvar notmuch-show-part-begin-regexp       "\fpart{")\r
+(defvar notmuch-show-part-end-regexp         "\fpart}")\r
+(defvar notmuch-show-marker-regexp "\f\\(message\\|header\\|body\\|attachm=\r
ent\\|part\\)[{}].*$")\r
+\r
+(defvar notmuch-show-id-regexp "\\(id:[^ ]*\\)")\r
+(defvar notmuch-show-depth-match-regexp " depth:\\([0-9]*\\).*match:\\([01=\r
]\\) ")\r
+(defvar notmuch-show-filename-regexp "filename:\\(.*\\)$")\r
+(defvar notmuch-show-contentype-regexp "Content-type: \\(.*\\)")\r
+\r
+(defvar notmuch-show-tags-regexp "(\\([^)]*\\))$")\r
+\r
+(defvar notmuch-show-parent-buffer nil)\r
+(defvar notmuch-show-body-read-visible nil)\r
+(defvar notmuch-show-citations-visible nil)\r
+(defvar notmuch-show-signatures-visible nil)\r
+(defvar notmuch-show-headers-visible nil)\r
+\r
+(defun notmuch-show-next-line ()\r
+  "Like builtin `next-line' but ensuring we end on a visible character.\r
+\r
+By advancing forward until reaching a visible character.\r
+\r
+Unlike builtin `next-line' this version accepts no arguments."\r
+  (interactive)\r
+  (set 'this-command 'next-line)\r
+  (call-interactively 'next-line)\r
+  (while (point-invisible-p)\r
+    (forward-char)))\r
+\r
+(defun notmuch-show-previous-line ()\r
+  "Like builtin `previous-line' but ensuring we end on a visible character.\r
+\r
+By advancing forward until reaching a visible character.\r
+\r
+Unlike builtin `previous-line' this version accepts no arguments."\r
+  (interactive)\r
+  (set 'this-command 'previous-line)\r
+  (call-interactively 'previous-line)\r
+  (while (point-invisible-p)\r
+    (forward-char)))\r
+\r
+(defun notmuch-show-get-message-id ()\r
+  (save-excursion\r
+    (beginning-of-line)\r
+    (if (not (looking-at notmuch-show-message-begin-regexp))\r
+       (re-search-backward notmuch-show-message-begin-regexp))\r
+    (re-search-forward notmuch-show-id-regexp)\r
+    (buffer-substring-no-properties (match-beginning 1) (match-end 1))))\r
+\r
+(defun notmuch-show-get-filename ()\r
+  (save-excursion\r
+    (beginning-of-line)\r
+    (if (not (looking-at notmuch-show-message-begin-regexp))\r
+       (re-search-backward notmuch-show-message-begin-regexp))\r
+    (re-search-forward notmuch-show-filename-regexp)\r
+    (buffer-substring-no-properties (match-beginning 1) (match-end 1))))\r
+\r
+(defun notmuch-show-set-tags (tags)\r
+  (save-excursion\r
+    (beginning-of-line)\r
+    (if (not (looking-at notmuch-show-message-begin-regexp))\r
+       (re-search-backward notmuch-show-message-begin-regexp))\r
+    (re-search-forward notmuch-show-tags-regexp)\r
+    (let ((inhibit-read-only t)\r
+         (beg (match-beginning 1))\r
+         (end (match-end 1)))\r
+      (delete-region beg end)\r
+      (goto-char beg)\r
+      (insert (mapconcat 'identity tags " ")))))\r
+\r
+(defun notmuch-show-get-tags ()\r
+  (save-excursion\r
+    (beginning-of-line)\r
+    (if (not (looking-at notmuch-show-message-begin-regexp))\r
+       (re-search-backward notmuch-show-message-begin-regexp))\r
+    (re-search-forward notmuch-show-tags-regexp)\r
+    (split-string (buffer-substring (match-beginning 1) (match-end 1)))))\r
+\r
+(defun notmuch-show-get-bcc ()\r
+  "Return BCC address(es) of current message"\r
+  (notmuch-show-get-header-field 'bcc))\r
+\r
+(defun notmuch-show-get-cc ()\r
+  "Return CC address(es) of current message"\r
+  (notmuch-show-get-header-field 'cc))\r
+\r
+(defun notmuch-show-get-date ()\r
+  "Return Date of current message"\r
+  (notmuch-show-get-header-field 'date))\r
+\r
+(defun notmuch-show-get-from ()\r
+  "Return From address of current message"\r
+  (notmuch-show-get-header-field 'from))\r
+\r
+(defun notmuch-show-get-subject ()\r
+  "Return Subject of current message"\r
+  (notmuch-show-get-header-field 'subject))\r
+\r
+(defun notmuch-show-get-to ()\r
+  "Return To address(es) of current message"\r
+  (notmuch-show-get-header-field 'to))\r
+\r
+(defun notmuch-show-get-header-field (name)\r
+  "Retrieve the header field NAME from the current message.\r
+NAME should be a symbol, in lower case, as returned by\r
+mail-header-extract-no-properties"\r
+  (let* ((result (assoc name (notmuch-show-get-header)))\r
+        (val (and result (cdr result))))\r
+    val))\r
+\r
+(defun notmuch-show-get-header ()\r
+  "Retrieve and parse the header from the current message. Returns an alis=\r
t with of (header . value)\r
+where header is a symbol and value is a string.  The summary from notmuch-=\r
show is returned as the\r
+pseudoheader summary"\r
+  (require 'mailheader)\r
+  (save-excursion\r
+    (beginning-of-line)\r
+    (if (not (looking-at notmuch-show-message-begin-regexp))\r
+       (re-search-backward notmuch-show-message-begin-regexp))\r
+    (re-search-forward (concat notmuch-show-header-begin-regexp "\n[[:spac=\r
e:]]*\\(.*\\)\n"))\r
+    (let* ((summary (buffer-substring-no-properties (match-beginning 1) (m=\r
atch-end 1)))\r
+         (beg (point)))\r
+      (re-search-forward notmuch-show-header-end-regexp)\r
+      (let ((text (buffer-substring beg (match-beginning 0))))\r
+       (with-temp-buffer\r
+         (insert text)\r
+         (goto-char (point-min))\r
+         (while (looking-at "\\([[:space:]]*\\)[A-Za-z][-A-Za-z0-9]*:")\r
+           (delete-region (match-beginning 1) (match-end 1))\r
+           (forward-line)\r
+           )\r
+         (goto-char (point-min))\r
+         (cons (cons 'summary summary) (mail-header-extract-no-properties)))))))\r
+\r
+(defun notmuch-show-add-tag (&rest toadd)\r
+  "Add a tag to the current message."\r
+  (interactive\r
+   (list (notmuch-select-tag-with-completion "Tag to add: ")))\r
+  (apply 'notmuch-call-notmuch-process\r
+        (append (cons "tag"\r
+                      (mapcar (lambda (s) (concat "+" s)) toadd))\r
+                (cons (notmuch-show-get-message-id) nil)))\r
+  (notmuch-show-set-tags (sort (union toadd (notmuch-show-get-tags) :test =\r
'string=3D) 'string<)))\r
+\r
+(defun notmuch-show-remove-tag (&rest toremove)\r
+  "Remove a tag from the current message."\r
+  (interactive\r
+   (list (notmuch-select-tag-with-completion "Tag to remove: " (notmuch-sh=\r
ow-get-message-id))))\r
+  (let ((tags (notmuch-show-get-tags)))\r
+    (if (intersection tags toremove :test 'string=3D)\r
+       (progn\r
+         (apply 'notmuch-call-notmuch-process\r
+                (append (cons "tag"\r
+                              (mapcar (lambda (s) (concat "-" s)) toremove))\r
+                        (cons (notmuch-show-get-message-id) nil)))\r
+         (notmuch-show-set-tags (sort (set-difference tags toremove :test 'strin=\r
g=3D) 'string<))))))\r
+\r
+(defun notmuch-show-archive-thread ()\r
+  "Archive each message in thread, then show next thread from search.\r
+\r
+Archive each message currently shown by removing the \"inbox\"\r
+tag from each. Then kill this buffer and show the next thread\r
+from the search from which this thread was originally shown.\r
+\r
+Note: This command is safe from any race condition of new messages\r
+being delivered to the same thread. It does not archive the\r
+entire thread, but only the messages shown in the current\r
+buffer."\r
+  (interactive)\r
+  (save-excursion\r
+    (goto-char (point-min))\r
+    (while (not (eobp))\r
+      (notmuch-show-remove-tag "inbox")\r
+      (if (not (eobp))\r
+         (forward-char))\r
+      (if (not (re-search-forward notmuch-show-message-begin-regexp nil t))\r
+         (goto-char (point-max)))))\r
+  (let ((parent-buffer notmuch-show-parent-buffer))\r
+    (kill-this-buffer)\r
+    (if parent-buffer\r
+       (progn\r
+         (switch-to-buffer parent-buffer)\r
+         (forward-line)\r
+         (notmuch-search-show-thread)))))\r
+\r
+(defun notmuch-show-archive-thread-then-exit ()\r
+  "Archive each message in thread, then exit back to search results."\r
+  (interactive)\r
+  (notmuch-show-archive-thread)\r
+  (kill-this-buffer))\r
+\r
+(defun notmuch-show-view-raw-message ()\r
+  "View the raw email of the current message."\r
+  (interactive)\r
+  (view-file (notmuch-show-get-filename)))\r
+\r
+(defmacro with-current-notmuch-show-message (&rest body)\r
+  "Evaluate body with current buffer set to the text of current message"\r
+  `(save-excursion\r
+     (let ((filename (notmuch-show-get-filename)))\r
+       (let ((buf (generate-new-buffer (concat "*notmuch-msg-" filename "*=\r
"))))\r
+         (with-current-buffer buf\r
+           (insert-file-contents filename nil nil nil t)\r
+           ,@body)\r
+        (kill-buffer buf)))))\r
+\r
+(defun notmuch-show-view-all-mime-parts ()\r
+  "Use external viewers to view all attachments from the current message."\r
+  (interactive)\r
+  (with-current-notmuch-show-message\r
+   ; We ovverride the mm-inline-media-tests to indicate which message\r
+   ; parts are already sufficiently handled by the original\r
+   ; presentation of the message in notmuch-show mode. These parts\r
+   ; will be inserted directly into the temporary buffer of\r
+   ; with-current-notmuch-show-message and silently discarded.\r
+   ;\r
+   ; Any MIME part not explicitly mentioned here will be handled by an\r
+   ; external viewer as configured in the various mailcap files.\r
+   (let ((mm-inline-media-tests '(\r
+                                 ("text/.*" ignore identity)\r
+                                 ("application/pgp-signature" ignore identity)\r
+                                 ("multipart/alternative" ignore identity)\r
+                                 ("multipart/mixed" ignore identity)\r
+                                 ("multipart/related" ignore identity)\r
+                                )))\r
+     (mm-display-parts (mm-dissect-buffer)))))\r
+\r
+(defun notmuch-show-save-attachments ()\r
+  "Save all attachments from the current message."\r
+  (interactive)\r
+  (with-current-notmuch-show-message\r
+   (let ((mm-handle (mm-dissect-buffer)))\r
+     (notmuch-save-attachments\r
+      mm-handle (> (notmuch-count-attachments mm-handle) 1))))\r
+  (message "Done"))\r
+\r
+(defun notmuch-show-reply ()\r
+  "Begin composing a reply to the current message in a new buffer."\r
+  (interactive)\r
+  (let ((message-id (notmuch-show-get-message-id)))\r
+    (notmuch-reply message-id)))\r
+\r
+(defun notmuch-show-forward-current ()\r
+  "Forward the current message."\r
+  (interactive)\r
+  (with-current-notmuch-show-message\r
+   (message-forward)))\r
+\r
+(defun notmuch-show-pipe-message (command)\r
+  "Pipe the contents of the current message to the given command.\r
+\r
+The given command will be executed with the raw contents of the\r
+current email message as stdin. Anything printed by the command\r
+to stdout or stderr will appear in the *Messages* buffer."\r
+  (interactive "sPipe message to command: ")\r
+  (apply 'start-process-shell-command "notmuch-pipe-command" "*notmuch-pip=\r
e*"\r
+        (list command " < " (shell-quote-argument (notmuch-show-get-filename)))))\r
+\r
+(defun notmuch-show-move-to-current-message-summary-line ()\r
+  "Move to the beginning of the one-line summary of the current message.\r
+\r
+This gives us a stable place to move to and work from since the\r
+summary line is always visible. This is important since moving to\r
+an invisible location is unreliable, (the main command loop moves\r
+point either forward or backward to the next visible character\r
+when a command ends with point on an invisible character).\r
+\r
+Emits an error if point is not within a valid message, (that is\r
+no pattern of `notmuch-show-message-begin-regexp' could be found\r
+by searching backward)."\r
+  (beginning-of-line)\r
+  (if (not (looking-at notmuch-show-message-begin-regexp))\r
+      (if (re-search-backward notmuch-show-message-begin-regexp nil t)\r
+         (forward-line 2)\r
+       (error "Not within a valid message."))\r
+    (forward-line 2)))\r
+\r
+(defun notmuch-show-last-message-p ()\r
+  "Predicate testing whether point is within the last message."\r
+  (save-window-excursion\r
+    (save-excursion\r
+      (notmuch-show-move-to-current-message-summary-line)\r
+      (not (re-search-forward notmuch-show-message-begin-regexp nil t)))))\r
+\r
+(defun notmuch-show-message-unread-p ()\r
+  "Predicate testing whether current message is unread."\r
+  (member "unread" (notmuch-show-get-tags)))\r
+\r
+(defun notmuch-show-message-open-p ()\r
+  "Predicate testing whether current message is open (body is visible)."\r
+  (let ((btn (previous-button (point) t)))\r
+    (while (not (button-has-type-p btn 'notmuch-button-body-toggle-type))\r
+      (setq btn (previous-button (button-start btn))))\r
+    (not (invisible-p (button-get btn 'invisibility-spec)))))\r
+\r
+(defun notmuch-show-next-message-without-marking-read ()\r
+  "Advance to the beginning of the next message in the buffer.\r
+\r
+Moves to the last visible character of the current message if\r
+already on the last message in the buffer.\r
+\r
+Returns nil if already on the last message in the buffer."\r
+  (notmuch-show-move-to-current-message-summary-line)\r
+  (if (re-search-forward notmuch-show-message-begin-regexp nil t)\r
+      (progn\r
+       (notmuch-show-move-to-current-message-summary-line)\r
+       (recenter 0)\r
+       t)\r
+    (goto-char (- (point-max) 1))\r
+    (while (point-invisible-p)\r
+      (backward-char))\r
+    (recenter 0)\r
+    nil))\r
+\r
+(defun notmuch-show-next-message ()\r
+  "Advance to the next message (whether open or closed)\r
+and remove the unread tag from that message.\r
+\r
+Moves to the last visible character of the current message if\r
+already on the last message in the buffer.\r
+\r
+Returns nil if already on the last message in the buffer."\r
+  (interactive)\r
+  (notmuch-show-next-message-without-marking-read)\r
+  (notmuch-show-mark-read))\r
+\r
+(defun notmuch-show-find-next-message ()\r
+  "Returns the position of the next message in the buffer.\r
+\r
+Or the position of the last visible character of the current\r
+message if already within the last message in the buffer."\r
+  ; save-excursion doesn't save our window position\r
+  ; save-window-excursion doesn't save point\r
+  ; Looks like we have to use both.\r
+  (save-excursion\r
+    (save-window-excursion\r
+      (notmuch-show-next-message-without-marking-read)\r
+      (point))))\r
+\r
+(defun notmuch-show-next-unread-message ()\r
+  "Advance to the next unread message.\r
+\r
+Moves to the last visible character of the current message if\r
+there are no more unread messages past the current point."\r
+  (notmuch-show-next-message-without-marking-read)\r
+  (while (and (not (notmuch-show-last-message-p))\r
+             (not (notmuch-show-message-unread-p)))\r
+    (notmuch-show-next-message-without-marking-read))\r
+  (if (not (notmuch-show-message-unread-p))\r
+      (notmuch-show-next-message-without-marking-read))\r
+  (notmuch-show-mark-read))\r
+\r
+(defun notmuch-show-next-open-message ()\r
+  "Advance to the next open message (that is, body is visible).\r
+\r
+Moves to the last visible character of the final message in the buffer\r
+if there are no more open messages."\r
+  (interactive)\r
+  (while (and (notmuch-show-next-message-without-marking-read)\r
+             (not (notmuch-show-message-open-p))))\r
+  (notmuch-show-mark-read))\r
+\r
+(defun notmuch-show-previous-message-without-marking-read ()\r
+  "Backup to the beginning of the previous message in the buffer.\r
+\r
+If within a message rather than at the beginning of it, then\r
+simply move to the beginning of the current message.\r
+\r
+Returns nil if already on the first message in the buffer."\r
+  (let ((start (point)))\r
+    (notmuch-show-move-to-current-message-summary-line)\r
+    (if (not (< (point) start))\r
+       ; Go backward twice to skip the current message's marker\r
+       (progn\r
+         (re-search-backward notmuch-show-message-begin-regexp nil t)\r
+         (re-search-backward notmuch-show-message-begin-regexp nil t)\r
+         (notmuch-show-move-to-current-message-summary-line)\r
+         (recenter 0)\r
+         (if (=3D (point) start)\r
+             nil\r
+           t))\r
+      (recenter 0)\r
+      nil)))\r
+\r
+(defun notmuch-show-previous-message ()\r
+  "Backup to the previous message (whether open or closed)\r
+and remove the unread tag from that message.\r
+\r
+If within a message rather than at the beginning of it, then\r
+simply move to the beginning of the current message."\r
+  (interactive)\r
+  (notmuch-show-previous-message-without-marking-read)\r
+  (notmuch-show-mark-read))\r
+\r
+(defun notmuch-show-find-previous-message ()\r
+  "Returns the position of the previous message in the buffer.\r
+\r
+Or the position of the beginning of the current message if point\r
+is originally within the message rather than at the beginning of\r
+it."\r
+  ; save-excursion doesn't save our window position\r
+  ; save-window-excursion doesn't save point\r
+  ; Looks like we have to use both.\r
+  (save-excursion\r
+    (save-window-excursion\r
+      (notmuch-show-previous-message-without-marking-read)\r
+      (point))))\r
+\r
+(defun notmuch-show-previous-open-message ()\r
+  "Backup to previous open message (that is, body is visible).\r
+\r
+Moves to the first message in the buffer if there are no previous\r
+open messages."\r
+  (interactive)\r
+  (while (and (notmuch-show-previous-message-without-marking-read)\r
+             (not (notmuch-show-message-open-p))))\r
+  (notmuch-show-mark-read))\r
+\r
+(defun notmuch-show-rewind ()\r
+  "Backup through the thread, (reverse scrolling compared to \\[notmuch-sh=\r
ow-advance-and-archive]).\r
+\r
+Specifically, if the beginning of the previous email is fewer\r
+than `window-height' lines from the current point, move to it\r
+just like `notmuch-show-previous-message'.\r
+\r
+Otherwise, just scroll down a screenful of the current message.\r
+\r
+This command does not modify any message tags, (it does not undo\r
+any effects from previous calls to\r
+`notmuch-show-advance-and-archive'."\r
+  (interactive)\r
+  (let ((previous (notmuch-show-find-previous-message)))\r
+    (if (> (count-lines previous (point)) (- (window-height) next-screen-c=\r
ontext-lines))\r
+       (progn\r
+         (condition-case nil\r
+             (scroll-down nil)\r
+           ((beginning-of-buffer) nil))\r
+         (goto-char (window-start))\r
+         ; Because count-lines counts invivisible lines, we may have\r
+         ; scrolled to far. If so., notice this and fix it up.\r
+         (if (< (point) previous)\r
+             (progn\r
+               (goto-char previous)\r
+               (recenter 0))))\r
+      (notmuch-show-previous-message))))\r
+\r
+(defun notmuch-show-advance-and-archive ()\r
+  "Advance through thread and archive.\r
+\r
+This command is intended to be one of the simplest ways to\r
+process a thread of email. It does the following:\r
+\r
+If the current message in the thread is not yet fully visible,\r
+scroll by a near screenful to read more of the message.\r
+\r
+Otherwise, (the end of the current message is already within the\r
+current window), advance to the next open message.\r
+\r
+Finally, if there is no further message to advance to, and this\r
+last message is already read, then archive the entire current\r
+thread, (remove the \"inbox\" tag from each message). Also kill\r
+this buffer, and display the next thread from the search from\r
+which this thread was originally shown."\r
+  (interactive)\r
+  (let ((next (notmuch-show-find-next-message))\r
+       (unread (notmuch-show-message-unread-p)))\r
+    (if (> next (window-end))\r
+       (scroll-up nil)\r
+      (let ((last (notmuch-show-last-message-p)))\r
+       (notmuch-show-next-open-message)\r
+       (if last\r
+           (notmuch-show-archive-thread))))))\r
+\r
+(defun notmuch-show-next-button ()\r
+  "Advance point to the next button in the buffer."\r
+  (interactive)\r
+  (forward-button 1))\r
+\r
+(defun notmuch-show-previous-button ()\r
+  "Move point back to the previous button in the buffer."\r
+  (interactive)\r
+  (backward-button 1))\r
+\r
+(defun notmuch-show-toggle-current-body ()\r
+  "Toggle the display of the current message body."\r
+  (interactive)\r
+  (save-excursion\r
+    (notmuch-show-move-to-current-message-summary-line)\r
+    (unless (button-at (point))\r
+      (notmuch-show-next-button))\r
+    (push-button))\r
+  )\r
+\r
+(defun notmuch-show-toggle-current-header ()\r
+  "Toggle the display of the current message header."\r
+  (interactive)\r
+  (save-excursion\r
+    (notmuch-show-move-to-current-message-summary-line)\r
+    (forward-line)\r
+    (unless (button-at (point))\r
+      (notmuch-show-next-button))\r
+    (push-button))\r
+  )\r
+\r
+(defun notmuch-show-citation-regexp (depth)\r
+  "Build a regexp for matching citations at a given DEPTH (indent)"\r
+  (let ((line-regexp (format "[[:space:]]\\{%d\\}>.*\n" depth)))\r
+    (concat "\\(?:^" line-regexp\r
+           "\\(?:[[:space:]]*\n" line-regexp\r
+           "\\)?\\)+")))\r
+\r
+(defun notmuch-show-region-to-button (beg end type prefix button-text)\r
+  "Auxilary function to do the actual making of overlays and buttons\r
+\r
+BEG and END are buffer locations. TYPE should a string, either\r
+\"citation\" or \"signature\". PREFIX is some arbitrary text to\r
+insert before the button, probably for indentation.  BUTTON-TEXT\r
+is what to put on the button."\r
+\r
+;; This uses some slightly tricky conversions between strings and\r
+;; symbols because of the way the button code works. Note that\r
+;; replacing intern-soft with make-symbol will cause this to fail,\r
+;; since the newly created symbol has no plist.\r
+\r
+  (let ((overlay (make-overlay beg end))\r
+       (invis-spec (make-symbol (concat "notmuch-" type "-region")))\r
+       (button-type (intern-soft (concat "notmuch-button-"\r
+                                         type "-toggle-type"))))\r
+    (add-to-invisibility-spec invis-spec)\r
+    (overlay-put overlay 'invisible invis-spec)\r
+    (goto-char (1+ end))\r
+    (save-excursion\r
+      (goto-char (1- beg))\r
+      (insert prefix)\r
+      (insert-button button-text\r
+                    'invisibility-spec invis-spec\r
+                    :type button-type)\r
+      )))\r
+\r
+(defun notmuch-show-markup-citations-region (beg end depth)\r
+  "Markup citations, and up to one signature in the given region"\r
+  ;; it would be nice if the untabify was not required, but\r
+  ;; that would require notmuch to indent with spaces.\r
+  (untabify beg end)\r
+  (let ((citation-regexp (notmuch-show-citation-regexp depth))\r
+       (signature-regexp (concat (format "^[[:space:]]\\{%d\\}" depth)\r
+                                 notmuch-show-signature-regexp))\r
+       (indent (concat "\n" (make-string depth ? ))))\r
+    (goto-char beg)\r
+    (beginning-of-line)\r
+    (while (and (< (point) end)\r
+               (re-search-forward citation-regexp end t))\r
+      (let* ((cite-start (match-beginning 0))\r
+            (cite-end  (match-end 0))\r
+            (cite-lines (count-lines cite-start cite-end)))\r
+       (when (> cite-lines (1+ notmuch-show-citation-lines-prefix))\r
+         (goto-char cite-start)\r
+         (forward-line notmuch-show-citation-lines-prefix)\r
+         (notmuch-show-region-to-button\r
+          (point) cite-end\r
+          "citation"\r
+          indent\r
+          (format notmuch-show-citation-button-format\r
+                  (- cite-lines notmuch-show-citation-lines-prefix))\r
+          ))))\r
+    (if (and (< (point) end)\r
+            (re-search-forward signature-regexp end t))\r
+       (let* ((sig-start (match-beginning 0))\r
+              (sig-end (match-end 0))\r
+              (sig-lines (1- (count-lines sig-start end))))\r
+         (if (<=3D sig-lines notmuch-show-signature-lines-max)\r
+             (notmuch-show-region-to-button\r
+              sig-start\r
+              end\r
+              "signature"\r
+              indent\r
+              (format notmuch-show-signature-button-format sig-lines)\r
+              ))))))\r
+\r
+(defun notmuch-show-markup-part (beg end depth)\r
+  (if (re-search-forward notmuch-show-part-begin-regexp nil t)\r
+      (progn\r
+        (let (mime-message mime-type)\r
+          (save-excursion\r
+            (re-search-forward notmuch-show-contentype-regexp end t)\r
+            (setq mime-type (car (split-string (buffer-substring\r
+                                                (match-beginning 1) (match=\r
-end 1))))))\r
+\r
+          (if (equal mime-type "text/html")\r
+              (let ((filename (notmuch-show-get-filename)))\r
+                (with-temp-buffer\r
+                  (insert-file-contents filename nil nil nil t)\r
+                  (setq mime-message (mm-dissect-buffer)))))\r
+          (forward-line)\r
+          (let ((beg (point-marker)))\r
+            (re-search-forward notmuch-show-part-end-regexp)\r
+            (let ((end (copy-marker (match-beginning 0))))\r
+              (goto-char end)\r
+              (if (not (bolp))\r
+                  (insert "\n"))\r
+              (indent-rigidly beg end depth)\r
+              (if (not (eq mime-message nil))\r
+                  (save-excursion\r
+                    (goto-char beg)\r
+                    (forward-line -1)\r
+                    (let ((handle-type (mm-handle-type mime-message))\r
+                          mime-type)\r
+                      (if (sequencep (car handle-type))\r
+                          (setq mime-type (car handle-type))\r
+                        (setq mime-type (car (car (cdr handle-type))))\r
+                        )\r
+                      (if (equal mime-type "text/html")\r
+                          (mm-display-part mime-message))))\r
+                )\r
+              (notmuch-show-markup-citations-region beg end depth)\r
+              ; Advance to the next part (if any) (so the outer loop can\r
+              ; determine whether we've left the current message.\r
+              (if (re-search-forward notmuch-show-part-begin-regexp nil t)\r
+                  (beginning-of-line)))))\r
+        (goto-char end))\r
+    (goto-char end)))\r
+\r
+(defun notmuch-show-markup-parts-region (beg end depth)\r
+  (save-excursion\r
+    (goto-char beg)\r
+    (while (< (point) end)\r
+      (notmuch-show-markup-part beg end depth))))\r
+\r
+(defun notmuch-show-markup-body (depth match btn)\r
+  "Markup a message body, (indenting, buttonizing citations,\r
+etc.), and hiding the body itself if the message does not match\r
+the current search.\r
+\r
+DEPTH specifies the depth at which this message appears in the\r
+tree of the current thread, (the top-level messages have depth 0\r
+and each reply increases depth by 1). MATCH indicates whether\r
+this message is regarded as matching the current search. BTN is\r
+the button which is used to toggle the visibility of this\r
+message.\r
+\r
+When this function is called, point must be within the message, but\r
+before the delimiter marking the beginning of the body."\r
+  (re-search-forward notmuch-show-body-begin-regexp)\r
+  (forward-line)\r
+  (let ((beg (point-marker)))\r
+    (re-search-forward notmuch-show-body-end-regexp)\r
+    (let ((end (copy-marker (match-beginning 0))))\r
+      (notmuch-show-markup-parts-region beg end depth)\r
+      (let ((invis-spec (make-symbol "notmuch-show-body-read")))\r
+        (overlay-put (make-overlay beg end)\r
+                     'invisible invis-spec)\r
+        (button-put btn 'invisibility-spec invis-spec)\r
+        (if (not match)\r
+            (add-to-invisibility-spec invis-spec)))\r
+      (set-marker beg nil)\r
+      (set-marker end nil)\r
+      )))\r
+\r
+(defun notmuch-show-markup-header (message-begin depth)\r
+  "Buttonize and decorate faces in a message header.\r
+\r
+MESSAGE-BEGIN is the position of the absolute first character in\r
+the message (including all delimiters that will end up being\r
+invisible etc.). This is to allow a button to reliably extend to\r
+the beginning of the message even if point is positioned at an\r
+invisible character (such as the beginning of the buffer).\r
+\r
+DEPTH specifies the depth at which this message appears in the\r
+tree of the current thread, (the top-level messages have depth 0\r
+and each reply increases depth by 1)."\r
+  (re-search-forward notmuch-show-header-begin-regexp)\r
+  (forward-line)\r
+  (let ((beg (point-marker))\r
+       (summary-end (copy-marker (line-beginning-position 2)))\r
+       (subject-end (copy-marker (line-end-position 2)))\r
+       (invis-spec (make-symbol "notmuch-show-header"))\r
+        (btn nil))\r
+    (re-search-forward notmuch-show-header-end-regexp)\r
+    (beginning-of-line)\r
+    (let ((end (point-marker)))\r
+      (indent-rigidly beg end depth)\r
+      (goto-char beg)\r
+      (setq btn (make-button message-begin summary-end :type 'notmuch-butt=\r
on-body-toggle-type))\r
+      (forward-line)\r
+      (add-to-invisibility-spec invis-spec)\r
+      (overlay-put (make-overlay subject-end end)\r
+                  'invisible invis-spec)\r
+      (make-button (line-beginning-position) subject-end\r
+                  'invisibility-spec invis-spec\r
+                  :type 'notmuch-button-headers-toggle-type)\r
+      (while (looking-at "[[:space:]]*[A-Za-z][-A-Za-z0-9]*:")\r
+       (beginning-of-line)\r
+       (notmuch-fontify-headers)\r
+       (forward-line)\r
+       )\r
+      (goto-char end)\r
+      (insert "\n")\r
+      (set-marker beg nil)\r
+      (set-marker summary-end nil)\r
+      (set-marker subject-end nil)\r
+      (set-marker end nil)\r
+      )\r
+  btn))\r
+\r
+(defun notmuch-show-markup-message ()\r
+  (if (re-search-forward notmuch-show-message-begin-regexp nil t)\r
+      (let ((message-begin (match-beginning 0)))\r
+       (re-search-forward notmuch-show-depth-match-regexp)\r
+       (let ((depth (string-to-number (buffer-substring (match-beginning 1) (mat=\r
ch-end 1))))\r
+             (match (string=3D "1" (buffer-substring (match-beginning 2) (match-=\r
end 2))))\r
+              (btn nil))\r
+         (setq btn (notmuch-show-markup-header message-begin depth))\r
+         (notmuch-show-markup-body depth match btn)))\r
+    (goto-char (point-max))))\r
+\r
+(defun notmuch-show-hide-markers ()\r
+  (save-excursion\r
+    (goto-char (point-min))\r
+    (while (not (eobp))\r
+      (if (re-search-forward notmuch-show-marker-regexp nil t)\r
+         (progn\r
+           (overlay-put (make-overlay (match-beginning 0) (+ (match-end 0) 1))\r
+                        'invisible 'notmuch-show-marker))\r
+       (goto-char (point-max))))))\r
+\r
+(defun notmuch-show-markup-messages ()\r
+  (save-excursion\r
+    (goto-char (point-min))\r
+    (while (not (eobp))\r
+      (notmuch-show-markup-message)))\r
+  (notmuch-show-hide-markers))\r
+\r
+;;;###autoload\r
+(defun notmuch-show-mode ()\r
+  "Major mode for viewing a thread with notmuch.\r
+\r
+This buffer contains the results of the \"notmuch show\" command\r
+for displaying a single thread of email from your email archives.\r
+\r
+By default, various components of email messages, (citations,\r
+signatures, already-read messages), are hidden. You can make\r
+these parts visible by clicking with the mouse button or by\r
+pressing RET after positioning the cursor on a hidden part, (for\r
+which \\[notmuch-show-next-button] and \\[notmuch-show-previous-button] ar=\r
e helpful).\r
+\r
+Reading the thread sequentially is well-supported by pressing\r
+\\[notmuch-show-advance-and-archive]. This will\r
+scroll the current message (if necessary), advance to the next\r
+message, or advance to the next thread (if already on the last\r
+message of a thread).\r
+\r
+Other commands are available to read or manipulate the thread more\r
+selectively, (such as '\\[notmuch-show-next-message]' and '\\[notmuch-show=\r
-previous-message]' to advance to messages without\r
+removing any tags, and '\\[notmuch-show-archive-thread]' to archive an ent=\r
ire thread without\r
+scrolling through with \\[notmuch-show-advance-and-archive]).\r
+\r
+You can add or remove arbitary tags from the current message with\r
+'\\[notmuch-show-add-tag]' or '\\[notmuch-show-remove-tag]'.\r
+\r
+All currently available key bindings:\r
+\r
+\\{notmuch-show-mode-map}"\r
+  (interactive)\r
+  (kill-all-local-variables)\r
+  (add-to-invisibility-spec 'notmuch-show-marker)\r
+  (use-local-map notmuch-show-mode-map)\r
+  (setq major-mode 'notmuch-show-mode\r
+       mode-name "notmuch-show")\r
+  (setq buffer-read-only t))\r
+\r
+(defcustom notmuch-show-hook nil\r
+  "List of functions to call when notmuch displays a message."\r
+  :type 'hook\r
+  :options '(goto-address)\r
+  :group 'notmuch)\r
+\r
+(defun notmuch-show-do-stash (text)\r
+    (kill-new text)\r
+    (message (concat "Saved: " text)))\r
+\r
+(defun notmuch-show-stash-cc ()\r
+  "Copy CC field of current message to kill-ring."\r
+  (interactive)\r
+  (notmuch-show-do-stash (notmuch-show-get-cc)))\r
+\r
+(defun notmuch-show-stash-date ()\r
+  "Copy date of current message to kill-ring."\r
+  (interactive)\r
+  (notmuch-show-do-stash (notmuch-show-get-date)))\r
+\r
+(defun notmuch-show-stash-filename ()\r
+  "Copy filename of current message to kill-ring."\r
+  (interactive)\r
+  (notmuch-show-do-stash (notmuch-show-get-filename)))\r
+\r
+(defun notmuch-show-stash-from ()\r
+  "Copy From address of current message to kill-ring."\r
+  (interactive)\r
+  (notmuch-show-do-stash (notmuch-show-get-from)))\r
+\r
+(defun notmuch-show-stash-message-id ()\r
+  "Copy message ID of current message to kill-ring."\r
+  (interactive)\r
+  (notmuch-show-do-stash (notmuch-show-get-message-id)))\r
+\r
+(defun notmuch-show-stash-subject ()\r
+  "Copy Subject field of current message to kill-ring."\r
+  (interactive)\r
+  (notmuch-show-do-stash (notmuch-show-get-subject)))\r
+\r
+(defun notmuch-show-stash-tags ()\r
+  "Copy tags of current message to kill-ring as a comma separated list."\r
+  (interactive)\r
+  (notmuch-show-do-stash (mapconcat 'identity (notmuch-show-get-tags) ",")=\r
))\r
+\r
+(defun notmuch-show-stash-to ()\r
+  "Copy To address of current message to kill-ring."\r
+  (interactive)\r
+  (notmuch-show-do-stash (notmuch-show-get-to)))\r
+\r
+; Make show mode a bit prettier, highlighting URLs and using word wrap\r
+\r
+(defun notmuch-show-mark-read ()\r
+  (notmuch-show-remove-tag "unread"))\r
+\r
+(defun notmuch-show-pretty-hook ()\r
+  (goto-address-mode 1)\r
+  (visual-line-mode))\r
+\r
+(add-hook 'notmuch-show-hook 'notmuch-show-mark-read)\r
+(add-hook 'notmuch-show-hook 'notmuch-show-pretty-hook)\r
+(add-hook 'notmuch-search-hook\r
+         (lambda()\r
+           (hl-line-mode 1) ))\r
+\r
+(defun notmuch-show (thread-id &optional parent-buffer query-context)\r
+  "Run \"notmuch show\" with the given thread ID and display results.\r
+\r
+The optional PARENT-BUFFER is the notmuch-search buffer from\r
+which this notmuch-show command was executed, (so that the next\r
+thread from that buffer can be show when done with this one).\r
+\r
+The optional QUERY-CONTEXT is a notmuch search term. Only messages from th=\r
e thread\r
+matching this search term are shown if non-nil. "\r
+  (interactive "sNotmuch show: ")\r
+  (let ((buffer (get-buffer-create (concat "*notmuch-show-" thread-id "*")=\r
)))\r
+    (switch-to-buffer buffer)\r
+    (notmuch-show-mode)\r
+    (set (make-local-variable 'notmuch-show-parent-buffer) parent-buffer)\r
+    (let ((proc (get-buffer-process (current-buffer)))\r
+         (inhibit-read-only t))\r
+      (if proc\r
+         (error "notmuch search process already running for query `%s'" thread-i=\r
d)\r
+       )\r
+      (erase-buffer)\r
+      (goto-char (point-min))\r
+      (save-excursion\r
+       (let* ((basic-args (list notmuch-command nil t nil "show" "--entire-threa=\r
d" thread-id))\r
+               (args (if query-context (append basic-args (list "and (" query-context "=\r
)")) basic-args)))\r
+         (apply 'call-process args)\r
+         (when (and (eq (buffer-size) 0) query-context)\r
+           (apply 'call-process basic-args)))\r
+       (notmuch-show-markup-messages)\r
+       )\r
+      (run-hooks 'notmuch-show-hook)\r
+      ; Move straight to the first open message\r
+      (if (not (notmuch-show-message-open-p))\r
+         (notmuch-show-next-open-message))\r
+      )))\r
+\r
+(provide 'notmuch-show)\r
diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
index 117a365..66990eb 100644\r
--- a/emacs/notmuch.el\r
+++ b/emacs/notmuch.el\r
@@ -51,114 +51,11 @@\r
 (require 'mm-view)\r
 (require 'message)\r
=20\r
-(defvar notmuch-show-stash-map\r
-  (let ((map (make-sparse-keymap)))\r
-    (define-key map "c" 'notmuch-show-stash-cc)\r
-    (define-key map "d" 'notmuch-show-stash-date)\r
-    (define-key map "F" 'notmuch-show-stash-filename)\r
-    (define-key map "f" 'notmuch-show-stash-from)\r
-    (define-key map "i" 'notmuch-show-stash-message-id)\r
-    (define-key map "s" 'notmuch-show-stash-subject)\r
-    (define-key map "T" 'notmuch-show-stash-tags)\r
-    (define-key map "t" 'notmuch-show-stash-to)\r
-    map)\r
-  "Submap for stash commands"\r
-  )\r
-\r
-(fset 'notmuch-show-stash-map notmuch-show-stash-map)\r
-\r
-(defvar notmuch-show-mode-map\r
-  (let ((map (make-sparse-keymap)))\r
-    (define-key map "?" 'notmuch-help)\r
-    (define-key map "q" 'kill-this-buffer)\r
-    (define-key map (kbd "C-p") 'notmuch-show-previous-line)\r
-    (define-key map (kbd "C-n") 'notmuch-show-next-line)\r
-    (define-key map (kbd "M-TAB") 'notmuch-show-previous-button)\r
-    (define-key map (kbd "TAB") 'notmuch-show-next-button)\r
-    (define-key map "s" 'notmuch-search)\r
-    (define-key map "m" 'message-mail)\r
-    (define-key map "f" 'notmuch-show-forward-current)\r
-    (define-key map "r" 'notmuch-show-reply)\r
-    (define-key map "|" 'notmuch-show-pipe-message)\r
-    (define-key map "w" 'notmuch-show-save-attachments)\r
-    (define-key map "V" 'notmuch-show-view-raw-message)\r
-    (define-key map "v" 'notmuch-show-view-all-mime-parts)\r
-    (define-key map "c" 'notmuch-show-stash-map)\r
-    (define-key map "b" 'notmuch-show-toggle-current-body)\r
-    (define-key map "h" 'notmuch-show-toggle-current-header)\r
-    (define-key map "-" 'notmuch-show-remove-tag)\r
-    (define-key map "+" 'notmuch-show-add-tag)\r
-    (define-key map "x" 'notmuch-show-archive-thread-then-exit)\r
-    (define-key map "a" 'notmuch-show-archive-thread)\r
-    (define-key map "P" 'notmuch-show-previous-message)\r
-    (define-key map "N" 'notmuch-show-next-message)\r
-    (define-key map "p" 'notmuch-show-previous-open-message)\r
-    (define-key map "n" 'notmuch-show-next-open-message)\r
-    (define-key map (kbd "DEL") 'notmuch-show-rewind)\r
-    (define-key map " " 'notmuch-show-advance-and-archive)\r
-    map)\r
-  "Keymap for \"notmuch show\" buffers.")\r
-(fset 'notmuch-show-mode-map notmuch-show-mode-map)\r
-\r
-(defvar notmuch-show-signature-regexp "\\(-- ?\\|_+\\)$"\r
-  "Pattern to match a line that separates content from signature.\r
-\r
-The regexp can (and should) include $ to match the end of the\r
-line, but should not include ^ to match the beginning of the\r
-line. This is because notmuch may have inserted additional space\r
-for indentation at the beginning of the line. But notmuch will\r
-move past the indentation when testing this pattern, (so that the\r
-pattern can still test against the entire line).")\r
-\r
-(defvar notmuch-show-signature-button-format\r
-  "[ %d-line signature. Click/Enter to toggle visibility. ]"\r
-  "String used to construct button text for hidden signatures\r
-\r
-Can use up to one integer format parameter, i.e. %d")\r
-\r
-(defvar notmuch-show-citation-button-format\r
-  "[ %d more citation lines. Click/Enter to toggle visibility. ]"\r
-  "String used to construct button text for hidden citations.\r
-\r
-Can use up to one integer format parameter, i.e. %d")\r
-\r
-(defvar notmuch-show-signature-lines-max 12\r
-  "Maximum length of signature that will be hidden by default.")\r
-\r
-(defvar notmuch-show-citation-lines-prefix 4\r
-  "Always show at least this many lines of a citation.\r
-\r
-If there is one more line, show that, otherwise collapse\r
-remaining lines into a button.")\r
+(require 'notmuch-show)\r
=20\r
 (defvar notmuch-command "notmuch"\r
   "Command to run the notmuch binary.")\r
=20\r
-(defvar notmuch-show-message-begin-regexp    "\fmessage{")\r
-(defvar notmuch-show-message-end-regexp      "\fmessage}")\r
-(defvar notmuch-show-header-begin-regexp     "\fheader{")\r
-(defvar notmuch-show-header-end-regexp       "\fheader}")\r
-(defvar notmuch-show-body-begin-regexp       "\fbody{")\r
-(defvar notmuch-show-body-end-regexp         "\fbody}")\r
-(defvar notmuch-show-attachment-begin-regexp "\fattachment{")\r
-(defvar notmuch-show-attachment-end-regexp   "\fattachment}")\r
-(defvar notmuch-show-part-begin-regexp       "\fpart{")\r
-(defvar notmuch-show-part-end-regexp         "\fpart}")\r
-(defvar notmuch-show-marker-regexp "\f\\(message\\|header\\|body\\|attachm=\r
ent\\|part\\)[{}].*$")\r
-\r
-(defvar notmuch-show-id-regexp "\\(id:[^ ]*\\)")\r
-(defvar notmuch-show-depth-match-regexp " depth:\\([0-9]*\\).*match:\\([01=\r
]\\) ")\r
-(defvar notmuch-show-filename-regexp "filename:\\(.*\\)$")\r
-(defvar notmuch-show-contentype-regexp "Content-type: \\(.*\\)")\r
-\r
-(defvar notmuch-show-tags-regexp "(\\([^)]*\\))$")\r
-\r
-(defvar notmuch-show-parent-buffer nil)\r
-(defvar notmuch-show-body-read-visible nil)\r
-(defvar notmuch-show-citations-visible nil)\r
-(defvar notmuch-show-signatures-visible nil)\r
-(defvar notmuch-show-headers-visible nil)\r
-\r
 ; XXX: This should be a generic function in emacs somewhere, not here\r
 (defun point-invisible-p ()\r
   "Return whether the character at point is invisible.\r
@@ -180,216 +77,6 @@ within the current window."\r
             (apply 'call-process notmuch-command nil t nil "search-tags" search-=\r
terms)))))\r
     (completing-read prompt (split-string tag-list "\n+" t) nil nil nil)))\r
=20\r
-(defun notmuch-show-next-line ()\r
-  "Like builtin `next-line' but ensuring we end on a visible character.\r
-\r
-By advancing forward until reaching a visible character.\r
-\r
-Unlike builtin `next-line' this version accepts no arguments."\r
-  (interactive)\r
-  (set 'this-command 'next-line)\r
-  (call-interactively 'next-line)\r
-  (while (point-invisible-p)\r
-    (forward-char)))\r
-\r
-(defun notmuch-show-previous-line ()\r
-  "Like builtin `previous-line' but ensuring we end on a visible character.\r
-\r
-By advancing forward until reaching a visible character.\r
-\r
-Unlike builtin `previous-line' this version accepts no arguments."\r
-  (interactive)\r
-  (set 'this-command 'previous-line)\r
-  (call-interactively 'previous-line)\r
-  (while (point-invisible-p)\r
-    (forward-char)))\r
-\r
-(defun notmuch-show-get-message-id ()\r
-  (save-excursion\r
-    (beginning-of-line)\r
-    (if (not (looking-at notmuch-show-message-begin-regexp))\r
-       (re-search-backward notmuch-show-message-begin-regexp))\r
-    (re-search-forward notmuch-show-id-regexp)\r
-    (buffer-substring-no-properties (match-beginning 1) (match-end 1))))\r
-\r
-(defun notmuch-show-get-filename ()\r
-  (save-excursion\r
-    (beginning-of-line)\r
-    (if (not (looking-at notmuch-show-message-begin-regexp))\r
-       (re-search-backward notmuch-show-message-begin-regexp))\r
-    (re-search-forward notmuch-show-filename-regexp)\r
-    (buffer-substring-no-properties (match-beginning 1) (match-end 1))))\r
-\r
-(defun notmuch-show-set-tags (tags)\r
-  (save-excursion\r
-    (beginning-of-line)\r
-    (if (not (looking-at notmuch-show-message-begin-regexp))\r
-       (re-search-backward notmuch-show-message-begin-regexp))\r
-    (re-search-forward notmuch-show-tags-regexp)\r
-    (let ((inhibit-read-only t)\r
-         (beg (match-beginning 1))\r
-         (end (match-end 1)))\r
-      (delete-region beg end)\r
-      (goto-char beg)\r
-      (insert (mapconcat 'identity tags " ")))))\r
-\r
-(defun notmuch-show-get-tags ()\r
-  (save-excursion\r
-    (beginning-of-line)\r
-    (if (not (looking-at notmuch-show-message-begin-regexp))\r
-       (re-search-backward notmuch-show-message-begin-regexp))\r
-    (re-search-forward notmuch-show-tags-regexp)\r
-    (split-string (buffer-substring (match-beginning 1) (match-end 1)))))\r
-\r
-(defun notmuch-show-get-bcc ()\r
-  "Return BCC address(es) of current message"\r
-  (notmuch-show-get-header-field 'bcc))\r
-\r
-(defun notmuch-show-get-cc ()\r
-  "Return CC address(es) of current message"\r
-  (notmuch-show-get-header-field 'cc))\r
-\r
-(defun notmuch-show-get-date ()\r
-  "Return Date of current message"\r
-  (notmuch-show-get-header-field 'date))\r
-\r
-(defun notmuch-show-get-from ()\r
-  "Return From address of current message"\r
-  (notmuch-show-get-header-field 'from))\r
-\r
-(defun notmuch-show-get-subject ()\r
-  "Return Subject of current message"\r
-  (notmuch-show-get-header-field 'subject))\r
-\r
-(defun notmuch-show-get-to ()\r
-  "Return To address(es) of current message"\r
-  (notmuch-show-get-header-field 'to))\r
-\r
-(defun notmuch-show-get-header-field (name)\r
-  "Retrieve the header field NAME from the current message.\r
-NAME should be a symbol, in lower case, as returned by\r
-mail-header-extract-no-properties"\r
-  (let* ((result (assoc name (notmuch-show-get-header)))\r
-        (val (and result (cdr result))))\r
-    val))\r
-\r
-(defun notmuch-show-get-header ()\r
-  "Retrieve and parse the header from the current message. Returns an alis=\r
t with of (header . value)\r
-where header is a symbol and value is a string.  The summary from notmuch-=\r
show is returned as the\r
-pseudoheader summary"\r
-  (require 'mailheader)\r
-  (save-excursion\r
-    (beginning-of-line)\r
-    (if (not (looking-at notmuch-show-message-begin-regexp))\r
-       (re-search-backward notmuch-show-message-begin-regexp))\r
-    (re-search-forward (concat notmuch-show-header-begin-regexp "\n[[:spac=\r
e:]]*\\(.*\\)\n"))\r
-    (let* ((summary (buffer-substring-no-properties (match-beginning 1) (m=\r
atch-end 1)))\r
-         (beg (point)))\r
-      (re-search-forward notmuch-show-header-end-regexp)\r
-      (let ((text (buffer-substring beg (match-beginning 0))))\r
-       (with-temp-buffer\r
-         (insert text)\r
-         (goto-char (point-min))\r
-         (while (looking-at "\\([[:space:]]*\\)[A-Za-z][-A-Za-z0-9]*:")\r
-           (delete-region (match-beginning 1) (match-end 1))\r
-           (forward-line)\r
-           )\r
-         (goto-char (point-min))\r
-         (cons (cons 'summary summary) (mail-header-extract-no-properties)))))))\r
-\r
-(defun notmuch-show-add-tag (&rest toadd)\r
-  "Add a tag to the current message."\r
-  (interactive\r
-   (list (notmuch-select-tag-with-completion "Tag to add: ")))\r
-  (apply 'notmuch-call-notmuch-process\r
-        (append (cons "tag"\r
-                      (mapcar (lambda (s) (concat "+" s)) toadd))\r
-                (cons (notmuch-show-get-message-id) nil)))\r
-  (notmuch-show-set-tags (sort (union toadd (notmuch-show-get-tags) :test =\r
'string=3D) 'string<)))\r
-\r
-(defun notmuch-show-remove-tag (&rest toremove)\r
-  "Remove a tag from the current message."\r
-  (interactive\r
-   (list (notmuch-select-tag-with-completion "Tag to remove: " (notmuch-sh=\r
ow-get-message-id))))\r
-  (let ((tags (notmuch-show-get-tags)))\r
-    (if (intersection tags toremove :test 'string=3D)\r
-       (progn\r
-         (apply 'notmuch-call-notmuch-process\r
-                (append (cons "tag"\r
-                              (mapcar (lambda (s) (concat "-" s)) toremove))\r
-                        (cons (notmuch-show-get-message-id) nil)))\r
-         (notmuch-show-set-tags (sort (set-difference tags toremove :test 'strin=\r
g=3D) 'string<))))))\r
-\r
-(defun notmuch-show-archive-thread ()\r
-  "Archive each message in thread, then show next thread from search.\r
-\r
-Archive each message currently shown by removing the \"inbox\"\r
-tag from each. Then kill this buffer and show the next thread\r
-from the search from which this thread was originally shown.\r
-\r
-Note: This command is safe from any race condition of new messages\r
-being delivered to the same thread. It does not archive the\r
-entire thread, but only the messages shown in the current\r
-buffer."\r
-  (interactive)\r
-  (save-excursion\r
-    (goto-char (point-min))\r
-    (while (not (eobp))\r
-      (notmuch-show-remove-tag "inbox")\r
-      (if (not (eobp))\r
-         (forward-char))\r
-      (if (not (re-search-forward notmuch-show-message-begin-regexp nil t))\r
-         (goto-char (point-max)))))\r
-  (let ((parent-buffer notmuch-show-parent-buffer))\r
-    (kill-this-buffer)\r
-    (if parent-buffer\r
-       (progn\r
-         (switch-to-buffer parent-buffer)\r
-         (forward-line)\r
-         (notmuch-search-show-thread)))))\r
-\r
-(defun notmuch-show-archive-thread-then-exit ()\r
-  "Archive each message in thread, then exit back to search results."\r
-  (interactive)\r
-  (notmuch-show-archive-thread)\r
-  (kill-this-buffer))\r
-\r
-(defun notmuch-show-view-raw-message ()\r
-  "View the raw email of the current message."\r
-  (interactive)\r
-  (view-file (notmuch-show-get-filename)))\r
-\r
-(defmacro with-current-notmuch-show-message (&rest body)\r
-  "Evaluate body with current buffer set to the text of current message"\r
-  `(save-excursion\r
-     (let ((filename (notmuch-show-get-filename)))\r
-       (let ((buf (generate-new-buffer (concat "*notmuch-msg-" filename "*=\r
"))))\r
-         (with-current-buffer buf\r
-           (insert-file-contents filename nil nil nil t)\r
-           ,@body)\r
-        (kill-buffer buf)))))\r
-\r
-(defun notmuch-show-view-all-mime-parts ()\r
-  "Use external viewers to view all attachments from the current message."\r
-  (interactive)\r
-  (with-current-notmuch-show-message\r
-   ; We ovverride the mm-inline-media-tests to indicate which message\r
-   ; parts are already sufficiently handled by the original\r
-   ; presentation of the message in notmuch-show mode. These parts\r
-   ; will be inserted directly into the temporary buffer of\r
-   ; with-current-notmuch-show-message and silently discarded.\r
-   ;\r
-   ; Any MIME part not explicitly mentioned here will be handled by an\r
-   ; external viewer as configured in the various mailcap files.\r
-   (let ((mm-inline-media-tests '(\r
-                                 ("text/.*" ignore identity)\r
-                                 ("application/pgp-signature" ignore identity)\r
-                                 ("multipart/alternative" ignore identity)\r
-                                 ("multipart/mixed" ignore identity)\r
-                                 ("multipart/related" ignore identity)\r
-                                )))\r
-     (mm-display-parts (mm-dissect-buffer)))))\r
-\r
 (defun notmuch-foreach-mime-part (function mm-handle)\r
   (cond ((stringp (car mm-handle))\r
          (dolist (part (cdr mm-handle))\r
@@ -426,15 +113,6 @@ buffer."\r
             (mm-save-part p))))\r
    mm-handle))\r
=20\r
-(defun notmuch-show-save-attachments ()\r
-  "Save all attachments from the current message."\r
-  (interactive)\r
-  (with-current-notmuch-show-message\r
-   (let ((mm-handle (mm-dissect-buffer)))\r
-     (notmuch-save-attachments\r
-      mm-handle (> (notmuch-count-attachments mm-handle) 1))))\r
-  (message "Done"))\r
-\r
 (defun notmuch-reply (query-string)\r
   (switch-to-buffer (generate-new-buffer "notmuch-draft"))\r
   (call-process notmuch-command nil t nil "reply" query-string)\r
@@ -446,253 +124,6 @@ buffer."\r
        (forward-line)))\r
   (message-mode))\r
=20\r
-(defun notmuch-show-reply ()\r
-  "Begin composing a reply to the current message in a new buffer."\r
-  (interactive)\r
-  (let ((message-id (notmuch-show-get-message-id)))\r
-    (notmuch-reply message-id)))\r
-\r
-(defun notmuch-show-forward-current ()\r
-  "Forward the current message."\r
-  (interactive)\r
-  (with-current-notmuch-show-message\r
-   (message-forward)))\r
-\r
-(defun notmuch-show-pipe-message (command)\r
-  "Pipe the contents of the current message to the given command.\r
-\r
-The given command will be executed with the raw contents of the\r
-current email message as stdin. Anything printed by the command\r
-to stdout or stderr will appear in the *Messages* buffer."\r
-  (interactive "sPipe message to command: ")\r
-  (apply 'start-process-shell-command "notmuch-pipe-command" "*notmuch-pip=\r
e*"\r
-        (list command " < " (shell-quote-argument (notmuch-show-get-filename)))))\r
-\r
-(defun notmuch-show-move-to-current-message-summary-line ()\r
-  "Move to the beginning of the one-line summary of the current message.\r
-\r
-This gives us a stable place to move to and work from since the\r
-summary line is always visible. This is important since moving to\r
-an invisible location is unreliable, (the main command loop moves\r
-point either forward or backward to the next visible character\r
-when a command ends with point on an invisible character).\r
-\r
-Emits an error if point is not within a valid message, (that is\r
-no pattern of `notmuch-show-message-begin-regexp' could be found\r
-by searching backward)."\r
-  (beginning-of-line)\r
-  (if (not (looking-at notmuch-show-message-begin-regexp))\r
-      (if (re-search-backward notmuch-show-message-begin-regexp nil t)\r
-         (forward-line 2)\r
-       (error "Not within a valid message."))\r
-    (forward-line 2)))\r
-\r
-(defun notmuch-show-last-message-p ()\r
-  "Predicate testing whether point is within the last message."\r
-  (save-window-excursion\r
-    (save-excursion\r
-      (notmuch-show-move-to-current-message-summary-line)\r
-      (not (re-search-forward notmuch-show-message-begin-regexp nil t)))))\r
-\r
-(defun notmuch-show-message-unread-p ()\r
-  "Predicate testing whether current message is unread."\r
-  (member "unread" (notmuch-show-get-tags)))\r
-\r
-(defun notmuch-show-message-open-p ()\r
-  "Predicate testing whether current message is open (body is visible)."\r
-  (let ((btn (previous-button (point) t)))\r
-    (while (not (button-has-type-p btn 'notmuch-button-body-toggle-type))\r
-      (setq btn (previous-button (button-start btn))))\r
-    (not (invisible-p (button-get btn 'invisibility-spec)))))\r
-\r
-(defun notmuch-show-next-message-without-marking-read ()\r
-  "Advance to the beginning of the next message in the buffer.\r
-\r
-Moves to the last visible character of the current message if\r
-already on the last message in the buffer.\r
-\r
-Returns nil if already on the last message in the buffer."\r
-  (notmuch-show-move-to-current-message-summary-line)\r
-  (if (re-search-forward notmuch-show-message-begin-regexp nil t)\r
-      (progn\r
-       (notmuch-show-move-to-current-message-summary-line)\r
-       (recenter 0)\r
-       t)\r
-    (goto-char (- (point-max) 1))\r
-    (while (point-invisible-p)\r
-      (backward-char))\r
-    (recenter 0)\r
-    nil))\r
-\r
-(defun notmuch-show-next-message ()\r
-  "Advance to the next message (whether open or closed)\r
-and remove the unread tag from that message.\r
-\r
-Moves to the last visible character of the current message if\r
-already on the last message in the buffer.\r
-\r
-Returns nil if already on the last message in the buffer."\r
-  (interactive)\r
-  (notmuch-show-next-message-without-marking-read)\r
-  (notmuch-show-mark-read))\r
-\r
-(defun notmuch-show-find-next-message ()\r
-  "Returns the position of the next message in the buffer.\r
-\r
-Or the position of the last visible character of the current\r
-message if already within the last message in the buffer."\r
-  ; save-excursion doesn't save our window position\r
-  ; save-window-excursion doesn't save point\r
-  ; Looks like we have to use both.\r
-  (save-excursion\r
-    (save-window-excursion\r
-      (notmuch-show-next-message-without-marking-read)\r
-      (point))))\r
-\r
-(defun notmuch-show-next-unread-message ()\r
-  "Advance to the next unread message.\r
-\r
-Moves to the last visible character of the current message if\r
-there are no more unread messages past the current point."\r
-  (notmuch-show-next-message-without-marking-read)\r
-  (while (and (not (notmuch-show-last-message-p))\r
-             (not (notmuch-show-message-unread-p)))\r
-    (notmuch-show-next-message-without-marking-read))\r
-  (if (not (notmuch-show-message-unread-p))\r
-      (notmuch-show-next-message-without-marking-read))\r
-  (notmuch-show-mark-read))\r
-\r
-(defun notmuch-show-next-open-message ()\r
-  "Advance to the next open message (that is, body is visible).\r
-\r
-Moves to the last visible character of the final message in the buffer\r
-if there are no more open messages."\r
-  (interactive)\r
-  (while (and (notmuch-show-next-message-without-marking-read)\r
-             (not (notmuch-show-message-open-p))))\r
-  (notmuch-show-mark-read))\r
-\r
-(defun notmuch-show-previous-message-without-marking-read ()\r
-  "Backup to the beginning of the previous message in the buffer.\r
-\r
-If within a message rather than at the beginning of it, then\r
-simply move to the beginning of the current message.\r
-\r
-Returns nil if already on the first message in the buffer."\r
-  (let ((start (point)))\r
-    (notmuch-show-move-to-current-message-summary-line)\r
-    (if (not (< (point) start))\r
-       ; Go backward twice to skip the current message's marker\r
-       (progn\r
-         (re-search-backward notmuch-show-message-begin-regexp nil t)\r
-         (re-search-backward notmuch-show-message-begin-regexp nil t)\r
-         (notmuch-show-move-to-current-message-summary-line)\r
-         (recenter 0)\r
-         (if (=3D (point) start)\r
-             nil\r
-           t))\r
-      (recenter 0)\r
-      nil)))\r
-\r
-(defun notmuch-show-previous-message ()\r
-  "Backup to the previous message (whether open or closed)\r
-and remove the unread tag from that message.\r
-\r
-If within a message rather than at the beginning of it, then\r
-simply move to the beginning of the current message."\r
-  (interactive)\r
-  (notmuch-show-previous-message-without-marking-read)\r
-  (notmuch-show-mark-read))\r
-\r
-(defun notmuch-show-find-previous-message ()\r
-  "Returns the position of the previous message in the buffer.\r
-\r
-Or the position of the beginning of the current message if point\r
-is originally within the message rather than at the beginning of\r
-it."\r
-  ; save-excursion doesn't save our window position\r
-  ; save-window-excursion doesn't save point\r
-  ; Looks like we have to use both.\r
-  (save-excursion\r
-    (save-window-excursion\r
-      (notmuch-show-previous-message-without-marking-read)\r
-      (point))))\r
-\r
-(defun notmuch-show-previous-open-message ()\r
-  "Backup to previous open message (that is, body is visible).\r
-\r
-Moves to the first message in the buffer if there are no previous\r
-open messages."\r
-  (interactive)\r
-  (while (and (notmuch-show-previous-message-without-marking-read)\r
-             (not (notmuch-show-message-open-p))))\r
-  (notmuch-show-mark-read))\r
-\r
-(defun notmuch-show-rewind ()\r
-  "Backup through the thread, (reverse scrolling compared to \\[notmuch-sh=\r
ow-advance-and-archive]).\r
-\r
-Specifically, if the beginning of the previous email is fewer\r
-than `window-height' lines from the current point, move to it\r
-just like `notmuch-show-previous-message'.\r
-\r
-Otherwise, just scroll down a screenful of the current message.\r
-\r
-This command does not modify any message tags, (it does not undo\r
-any effects from previous calls to\r
-`notmuch-show-advance-and-archive'."\r
-  (interactive)\r
-  (let ((previous (notmuch-show-find-previous-message)))\r
-    (if (> (count-lines previous (point)) (- (window-height) next-screen-c=\r
ontext-lines))\r
-       (progn\r
-         (condition-case nil\r
-             (scroll-down nil)\r
-           ((beginning-of-buffer) nil))\r
-         (goto-char (window-start))\r
-         ; Because count-lines counts invivisible lines, we may have\r
-         ; scrolled to far. If so., notice this and fix it up.\r
-         (if (< (point) previous)\r
-             (progn\r
-               (goto-char previous)\r
-               (recenter 0))))\r
-      (notmuch-show-previous-message))))\r
-\r
-(defun notmuch-show-advance-and-archive ()\r
-  "Advance through thread and archive.\r
-\r
-This command is intended to be one of the simplest ways to\r
-process a thread of email. It does the following:\r
-\r
-If the current message in the thread is not yet fully visible,\r
-scroll by a near screenful to read more of the message.\r
-\r
-Otherwise, (the end of the current message is already within the\r
-current window), advance to the next open message.\r
-\r
-Finally, if there is no further message to advance to, and this\r
-last message is already read, then archive the entire current\r
-thread, (remove the \"inbox\" tag from each message). Also kill\r
-this buffer, and display the next thread from the search from\r
-which this thread was originally shown."\r
-  (interactive)\r
-  (let ((next (notmuch-show-find-next-message))\r
-       (unread (notmuch-show-message-unread-p)))\r
-    (if (> next (window-end))\r
-       (scroll-up nil)\r
-      (let ((last (notmuch-show-last-message-p)))\r
-       (notmuch-show-next-open-message)\r
-       (if last\r
-           (notmuch-show-archive-thread))))))\r
-\r
-(defun notmuch-show-next-button ()\r
-  "Advance point to the next button in the buffer."\r
-  (interactive)\r
-  (forward-button 1))\r
-\r
-(defun notmuch-show-previous-button ()\r
-  "Move point back to the previous button in the buffer."\r
-  (interactive)\r
-  (backward-button 1))\r
-\r
 (defun notmuch-toggle-invisible-action (cite-button)\r
   (let ((invis-spec (button-get cite-button 'invisibility-spec)))\r
         (if (invisible-p invis-spec)\r
@@ -702,27 +133,6 @@ which this thread was originally shown."\r
   (force-window-update)\r
   (redisplay t))\r
=20\r
-(defun notmuch-show-toggle-current-body ()\r
-  "Toggle the display of the current message body."\r
-  (interactive)\r
-  (save-excursion\r
-    (notmuch-show-move-to-current-message-summary-line)\r
-    (unless (button-at (point))\r
-      (notmuch-show-next-button))\r
-    (push-button))\r
-  )\r
-\r
-(defun notmuch-show-toggle-current-header ()\r
-  "Toggle the display of the current message header."\r
-  (interactive)\r
-  (save-excursion\r
-    (notmuch-show-move-to-current-message-summary-line)\r
-    (forward-line)\r
-    (unless (button-at (point))\r
-      (notmuch-show-next-button))\r
-    (push-button))\r
-  )\r
-\r
 (define-button-type 'notmuch-button-invisibility-toggle-type\r
   'action 'notmuch-toggle-invisible-action\r
   'follow-link t\r
@@ -738,161 +148,6 @@ which this thread was originally shown."\r
   'face 'notmuch-message-summary-face\r
   :supertype 'notmuch-button-invisibility-toggle-type)\r
=20\r
-(defun notmuch-show-citation-regexp (depth)\r
-  "Build a regexp for matching citations at a given DEPTH (indent)"\r
-  (let ((line-regexp (format "[[:space:]]\\{%d\\}>.*\n" depth)))\r
-    (concat "\\(?:^" line-regexp\r
-           "\\(?:[[:space:]]*\n" line-regexp\r
-           "\\)?\\)+")))\r
-\r
-(defun notmuch-show-region-to-button (beg end type prefix button-text)\r
-  "Auxilary function to do the actual making of overlays and buttons\r
-\r
-BEG and END are buffer locations. TYPE should a string, either\r
-\"citation\" or \"signature\". PREFIX is some arbitrary text to\r
-insert before the button, probably for indentation.  BUTTON-TEXT\r
-is what to put on the button."\r
-\r
-;; This uses some slightly tricky conversions between strings and\r
-;; symbols because of the way the button code works. Note that\r
-;; replacing intern-soft with make-symbol will cause this to fail,\r
-;; since the newly created symbol has no plist.\r
-\r
-  (let ((overlay (make-overlay beg end))\r
-       (invis-spec (make-symbol (concat "notmuch-" type "-region")))\r
-       (button-type (intern-soft (concat "notmuch-button-"\r
-                                         type "-toggle-type"))))\r
-    (add-to-invisibility-spec invis-spec)\r
-    (overlay-put overlay 'invisible invis-spec)\r
-    (goto-char (1+ end))\r
-    (save-excursion\r
-      (goto-char (1- beg))\r
-      (insert prefix)\r
-      (insert-button button-text\r
-                    'invisibility-spec invis-spec\r
-                    :type button-type)\r
-      )))\r
-\r
-\r
-(defun notmuch-show-markup-citations-region (beg end depth)\r
-  "Markup citations, and up to one signature in the given region"\r
-  ;; it would be nice if the untabify was not required, but\r
-  ;; that would require notmuch to indent with spaces.\r
-  (untabify beg end)\r
-  (let ((citation-regexp (notmuch-show-citation-regexp depth))\r
-       (signature-regexp (concat (format "^[[:space:]]\\{%d\\}" depth)\r
-                                 notmuch-show-signature-regexp))\r
-       (indent (concat "\n" (make-string depth ? ))))\r
-    (goto-char beg)\r
-    (beginning-of-line)\r
-    (while (and (< (point) end)\r
-               (re-search-forward citation-regexp end t))\r
-      (let* ((cite-start (match-beginning 0))\r
-            (cite-end  (match-end 0))\r
-            (cite-lines (count-lines cite-start cite-end)))\r
-       (when (> cite-lines (1+ notmuch-show-citation-lines-prefix))\r
-         (goto-char cite-start)\r
-         (forward-line notmuch-show-citation-lines-prefix)\r
-         (notmuch-show-region-to-button\r
-          (point) cite-end\r
-          "citation"\r
-          indent\r
-          (format notmuch-show-citation-button-format\r
-                  (- cite-lines notmuch-show-citation-lines-prefix))\r
-          ))))\r
-    (if (and (< (point) end)\r
-            (re-search-forward signature-regexp end t))\r
-       (let* ((sig-start (match-beginning 0))\r
-              (sig-end (match-end 0))\r
-              (sig-lines (1- (count-lines sig-start end))))\r
-         (if (<=3D sig-lines notmuch-show-signature-lines-max)\r
-             (notmuch-show-region-to-button\r
-              sig-start\r
-              end\r
-              "signature"\r
-              indent\r
-              (format notmuch-show-signature-button-format sig-lines)\r
-              ))))))\r
-\r
-(defun notmuch-show-markup-part (beg end depth)\r
-  (if (re-search-forward notmuch-show-part-begin-regexp nil t)\r
-      (progn\r
-        (let (mime-message mime-type)\r
-          (save-excursion\r
-            (re-search-forward notmuch-show-contentype-regexp end t)\r
-            (setq mime-type (car (split-string (buffer-substring\r
-                                                (match-beginning 1) (match=\r
-end 1))))))\r
-\r
-          (if (equal mime-type "text/html")\r
-              (let ((filename (notmuch-show-get-filename)))\r
-                (with-temp-buffer\r
-                  (insert-file-contents filename nil nil nil t)\r
-                  (setq mime-message (mm-dissect-buffer)))))\r
-          (forward-line)\r
-          (let ((beg (point-marker)))\r
-            (re-search-forward notmuch-show-part-end-regexp)\r
-            (let ((end (copy-marker (match-beginning 0))))\r
-              (goto-char end)\r
-              (if (not (bolp))\r
-                  (insert "\n"))\r
-              (indent-rigidly beg end depth)\r
-              (if (not (eq mime-message nil))\r
-                  (save-excursion\r
-                    (goto-char beg)\r
-                    (forward-line -1)\r
-                    (let ((handle-type (mm-handle-type mime-message))\r
-                          mime-type)\r
-                      (if (sequencep (car handle-type))\r
-                          (setq mime-type (car handle-type))\r
-                        (setq mime-type (car (car (cdr handle-type))))\r
-                        )\r
-                      (if (equal mime-type "text/html")\r
-                          (mm-display-part mime-message))))\r
-                )\r
-              (notmuch-show-markup-citations-region beg end depth)\r
-              ; Advance to the next part (if any) (so the outer loop can\r
-              ; determine whether we've left the current message.\r
-              (if (re-search-forward notmuch-show-part-begin-regexp nil t)\r
-                  (beginning-of-line)))))\r
-        (goto-char end))\r
-    (goto-char end)))\r
-\r
-(defun notmuch-show-markup-parts-region (beg end depth)\r
-  (save-excursion\r
-    (goto-char beg)\r
-    (while (< (point) end)\r
-      (notmuch-show-markup-part beg end depth))))\r
-\r
-(defun notmuch-show-markup-body (depth match btn)\r
-  "Markup a message body, (indenting, buttonizing citations,\r
-etc.), and hiding the body itself if the message does not match\r
-the current search.\r
-\r
-DEPTH specifies the depth at which this message appears in the\r
-tree of the current thread, (the top-level messages have depth 0\r
-and each reply increases depth by 1). MATCH indicates whether\r
-this message is regarded as matching the current search. BTN is\r
-the button which is used to toggle the visibility of this\r
-message.\r
-\r
-When this function is called, point must be within the message, but\r
-before the delimiter marking the beginning of the body."\r
-  (re-search-forward notmuch-show-body-begin-regexp)\r
-  (forward-line)\r
-  (let ((beg (point-marker)))\r
-    (re-search-forward notmuch-show-body-end-regexp)\r
-    (let ((end (copy-marker (match-beginning 0))))\r
-      (notmuch-show-markup-parts-region beg end depth)\r
-      (let ((invis-spec (make-symbol "notmuch-show-body-read")))\r
-        (overlay-put (make-overlay beg end)\r
-                     'invisible invis-spec)\r
-        (button-put btn 'invisibility-spec invis-spec)\r
-        (if (not match)\r
-            (add-to-invisibility-spec invis-spec)))\r
-      (set-marker beg nil)\r
-      (set-marker end nil)\r
-      )))\r
-\r
 (defun notmuch-fontify-headers ()\r
   (while (looking-at "[[:space:]]")\r
     (forward-char))\r
@@ -921,80 +176,6 @@ before the delimiter marking the beginning of the body=\r
."\r
              (overlay-put (make-overlay (point) (re-search-forward ".*$"))\r
                           'face 'message-header-other)))))))\r
=20\r
-(defun notmuch-show-markup-header (message-begin depth)\r
-  "Buttonize and decorate faces in a message header.\r
-\r
-MESSAGE-BEGIN is the position of the absolute first character in\r
-the message (including all delimiters that will end up being\r
-invisible etc.). This is to allow a button to reliably extend to\r
-the beginning of the message even if point is positioned at an\r
-invisible character (such as the beginning of the buffer).\r
-\r
-DEPTH specifies the depth at which this message appears in the\r
-tree of the current thread, (the top-level messages have depth 0\r
-and each reply increases depth by 1)."\r
-  (re-search-forward notmuch-show-header-begin-regexp)\r
-  (forward-line)\r
-  (let ((beg (point-marker))\r
-       (summary-end (copy-marker (line-beginning-position 2)))\r
-       (subject-end (copy-marker (line-end-position 2)))\r
-       (invis-spec (make-symbol "notmuch-show-header"))\r
-        (btn nil))\r
-    (re-search-forward notmuch-show-header-end-regexp)\r
-    (beginning-of-line)\r
-    (let ((end (point-marker)))\r
-      (indent-rigidly beg end depth)\r
-      (goto-char beg)\r
-      (setq btn (make-button message-begin summary-end :type 'notmuch-butt=\r
on-body-toggle-type))\r
-      (forward-line)\r
-      (add-to-invisibility-spec invis-spec)\r
-      (overlay-put (make-overlay subject-end end)\r
-                  'invisible invis-spec)\r
-      (make-button (line-beginning-position) subject-end\r
-                  'invisibility-spec invis-spec\r
-                  :type 'notmuch-button-headers-toggle-type)\r
-      (while (looking-at "[[:space:]]*[A-Za-z][-A-Za-z0-9]*:")\r
-       (beginning-of-line)\r
-       (notmuch-fontify-headers)\r
-       (forward-line)\r
-       )\r
-      (goto-char end)\r
-      (insert "\n")\r
-      (set-marker beg nil)\r
-      (set-marker summary-end nil)\r
-      (set-marker subject-end nil)\r
-      (set-marker end nil)\r
-      )\r
-  btn))\r
-\r
-(defun notmuch-show-markup-message ()\r
-  (if (re-search-forward notmuch-show-message-begin-regexp nil t)\r
-      (let ((message-begin (match-beginning 0)))\r
-       (re-search-forward notmuch-show-depth-match-regexp)\r
-       (let ((depth (string-to-number (buffer-substring (match-beginning 1) (mat=\r
ch-end 1))))\r
-             (match (string=3D "1" (buffer-substring (match-beginning 2) (match-=\r
end 2))))\r
-              (btn nil))\r
-         (setq btn (notmuch-show-markup-header message-begin depth))\r
-         (notmuch-show-markup-body depth match btn)))\r
-    (goto-char (point-max))))\r
-\r
-(defun notmuch-show-hide-markers ()\r
-  (save-excursion\r
-    (goto-char (point-min))\r
-    (while (not (eobp))\r
-      (if (re-search-forward notmuch-show-marker-regexp nil t)\r
-         (progn\r
-           (overlay-put (make-overlay (match-beginning 0) (+ (match-end 0) 1))\r
-                        'invisible 'notmuch-show-marker))\r
-       (goto-char (point-max))))))\r
-\r
-(defun notmuch-show-markup-messages ()\r
-  (save-excursion\r
-    (goto-char (point-min))\r
-    (while (not (eobp))\r
-      (notmuch-show-markup-message)))\r
-  (notmuch-show-hide-markers))\r
-\r
 (defun notmuch-documentation-first-line (symbol)\r
   "Return the first line of the documentation string for SYMBOL."\r
   (let ((doc (documentation symbol)))\r
@@ -1065,154 +246,16 @@ For a mouse binding, return nil."\r
       (set-buffer-modified-p nil)\r
       (view-buffer (current-buffer) 'kill-buffer-if-not-modified))))\r
=20\r
-;;;###autoload\r
-(defun notmuch-show-mode ()\r
-  "Major mode for viewing a thread with notmuch.\r
-\r
-This buffer contains the results of the \"notmuch show\" command\r
-for displaying a single thread of email from your email archives.\r
-\r
-By default, various components of email messages, (citations,\r
-signatures, already-read messages), are hidden. You can make\r
-these parts visible by clicking with the mouse button or by\r
-pressing RET after positioning the cursor on a hidden part, (for\r
-which \\[notmuch-show-next-button] and \\[notmuch-show-previous-button] ar=\r
e helpful).\r
-\r
-Reading the thread sequentially is well-supported by pressing\r
-\\[notmuch-show-advance-and-archive]. This will\r
-scroll the current message (if necessary), advance to the next\r
-message, or advance to the next thread (if already on the last\r
-message of a thread).\r
-\r
-Other commands are available to read or manipulate the thread more\r
-selectively, (such as '\\[notmuch-show-next-message]' and '\\[notmuch-show=\r
-previous-message]' to advance to messages without\r
-removing any tags, and '\\[notmuch-show-archive-thread]' to archive an ent=\r
ire thread without\r
-scrolling through with \\[notmuch-show-advance-and-archive]).\r
-\r
-You can add or remove arbitary tags from the current message with\r
-'\\[notmuch-show-add-tag]' or '\\[notmuch-show-remove-tag]'.\r
-\r
-All currently available key bindings:\r
-\r
-\\{notmuch-show-mode-map}"\r
-  (interactive)\r
-  (kill-all-local-variables)\r
-  (add-to-invisibility-spec 'notmuch-show-marker)\r
-  (use-local-map notmuch-show-mode-map)\r
-  (setq major-mode 'notmuch-show-mode\r
-       mode-name "notmuch-show")\r
-  (setq buffer-read-only t))\r
-\r
 (defgroup notmuch nil\r
   "Notmuch mail reader for Emacs."\r
   :group 'mail)\r
=20\r
-(defcustom notmuch-show-hook nil\r
-  "List of functions to call when notmuch displays a message."\r
-  :type 'hook\r
-  :options '(goto-address)\r
-  :group 'notmuch)\r
-\r
 (defcustom notmuch-search-hook nil\r
   "List of functions to call when notmuch displays the search results."\r
   :type 'hook\r
   :options '(hl-line-mode)\r
   :group 'notmuch)\r
=20\r
-(defun notmuch-show-do-stash (text)\r
-    (kill-new text)\r
-    (message (concat "Saved: " text)))\r
-\r
-(defun notmuch-show-stash-cc ()\r
-  "Copy CC field of current message to kill-ring."\r
-  (interactive)\r
-  (notmuch-show-do-stash (notmuch-show-get-cc)))\r
-\r
-(defun notmuch-show-stash-date ()\r
-  "Copy date of current message to kill-ring."\r
-  (interactive)\r
-  (notmuch-show-do-stash (notmuch-show-get-date)))\r
-\r
-(defun notmuch-show-stash-filename ()\r
-  "Copy filename of current message to kill-ring."\r
-  (interactive)\r
-  (notmuch-show-do-stash (notmuch-show-get-filename)))\r
-\r
-(defun notmuch-show-stash-from ()\r
-  "Copy From address of current message to kill-ring."\r
-  (interactive)\r
-  (notmuch-show-do-stash (notmuch-show-get-from)))\r
-\r
-(defun notmuch-show-stash-message-id ()\r
-  "Copy message ID of current message to kill-ring."\r
-  (interactive)\r
-  (notmuch-show-do-stash (notmuch-show-get-message-id)))\r
-\r
-(defun notmuch-show-stash-subject ()\r
-  "Copy Subject field of current message to kill-ring."\r
-  (interactive)\r
-  (notmuch-show-do-stash (notmuch-show-get-subject)))\r
-\r
-(defun notmuch-show-stash-tags ()\r
-  "Copy tags of current message to kill-ring as a comma separated list."\r
-  (interactive)\r
-  (notmuch-show-do-stash (mapconcat 'identity (notmuch-show-get-tags) ",")=\r
))\r
-\r
-(defun notmuch-show-stash-to ()\r
-  "Copy To address of current message to kill-ring."\r
-  (interactive)\r
-  (notmuch-show-do-stash (notmuch-show-get-to)))\r
-\r
-; Make show mode a bit prettier, highlighting URLs and using word wrap\r
-\r
-(defun notmuch-show-mark-read ()\r
-  (notmuch-show-remove-tag "unread"))\r
-\r
-(defun notmuch-show-pretty-hook ()\r
-  (goto-address-mode 1)\r
-  (visual-line-mode))\r
-\r
-(add-hook 'notmuch-show-hook 'notmuch-show-mark-read)\r
-(add-hook 'notmuch-show-hook 'notmuch-show-pretty-hook)\r
-(add-hook 'notmuch-search-hook\r
-         (lambda()\r
-           (hl-line-mode 1) ))\r
-\r
-(defun notmuch-show (thread-id &optional parent-buffer query-context)\r
-  "Run \"notmuch show\" with the given thread ID and display results.\r
-\r
-The optional PARENT-BUFFER is the notmuch-search buffer from\r
-which this notmuch-show command was executed, (so that the next\r
-thread from that buffer can be show when done with this one).\r
-\r
-The optional QUERY-CONTEXT is a notmuch search term. Only messages from th=\r
e thread\r
-matching this search term are shown if non-nil. "\r
-  (interactive "sNotmuch show: ")\r
-  (let ((buffer (get-buffer-create (concat "*notmuch-show-" thread-id "*")=\r
)))\r
-    (switch-to-buffer buffer)\r
-    (notmuch-show-mode)\r
-    (set (make-local-variable 'notmuch-show-parent-buffer) parent-buffer)\r
-    (let ((proc (get-buffer-process (current-buffer)))\r
-         (inhibit-read-only t))\r
-      (if proc\r
-         (error "notmuch search process already running for query `%s'" thread-i=\r
d)\r
-       )\r
-      (erase-buffer)\r
-      (goto-char (point-min))\r
-      (save-excursion\r
-       (let* ((basic-args (list notmuch-command nil t nil "show" "--entire-threa=\r
d" thread-id))\r
-               (args (if query-context (append basic-args (list "and (" query-context "=\r
)")) basic-args)))\r
-         (apply 'call-process args)\r
-         (when (and (eq (buffer-size) 0) query-context)\r
-           (apply 'call-process basic-args)))\r
-       (notmuch-show-markup-messages)\r
-       )\r
-      (run-hooks 'notmuch-show-hook)\r
-      ; Move straight to the first open message\r
-      (if (not (notmuch-show-message-open-p))\r
-         (notmuch-show-next-open-message))\r
-      )))\r
-\r
 (defvar notmuch-search-authors-width 40\r
   "Number of columns to use to display authors in a notmuch-search buffer.=\r
")\r
=20\r
@@ -1637,7 +680,6 @@ current search results AND that are tagged with the gi=\r
ven tag."\r
    (list (notmuch-select-tag-with-completion "Filter by tag: ")))\r
   (notmuch-search (concat notmuch-search-query-string " and tag:" tag) not=\r
much-search-oldest-first))\r
=20\r
-\r
 ;;;###autoload\r
 (defun notmuch ()\r
   "Run notmuch to display all mail with tag of 'inbox'"\r
--=20\r
1.7.0\r
\r
\r
dme.\r
--=20\r
David Edmondson, http://dme.org\r