--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 4736D431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 10 Nov 2012 20:46:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\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 rTlO0hGBdfEr for <notmuch@notmuchmail.org>;\r
+ Sat, 10 Nov 2012 20:46:27 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+ [18.9.25.14])\r
+ by olra.theworths.org (Postfix) with ESMTP id 095B0431FBD\r
+ for <notmuch@notmuchmail.org>; Sat, 10 Nov 2012 20:46:26 -0800 (PST)\r
+X-AuditID: 1209190e-b7f756d000000904-88-509f2da23010\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 9D.98.02308.2AD2F905; Sat, 10 Nov 2012 23:46:26 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qAB4kOLG025911; \r
+ Sat, 10 Nov 2012 23:46:24 -0500\r
+Received: from drake.dyndns.org\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qAB4kJc5001919\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 10 Nov 2012 23:46:21 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TXPR5-0003a7-Or; Sat, 10 Nov 2012 23:46:19 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/3] emacs: Buttonize mid: links\r
+Date: Sat, 10 Nov 2012 23:46:15 -0500\r
+Message-Id: <1352609175-12790-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1352609175-12790-1-git-send-email-amdragon@mit.edu>\r
+References: <1352609175-12790-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrGIsWRmVeSWpSXmKPExsUixG6nrrtId36AweUJUhZN050trt+cyWzR\r
+ 2veUxYHZ49b91+wez1bdYvbY+PcHSwBzFJdNSmpOZllqkb5dAlfGprntbAX7pCqW757M1sC4\r
+ WrSLkZNDQsBE4vHKxewQtpjEhXvr2boYuTiEBPYxSjw4eZMFwtnAKLF1zl9mCOcRk8TmO8+g\r
+ yuYySmw/sJEZpJ9NQENi2/7ljCC2iIC0xM67s1lBbGaBVInVOzvAaoQFjCW27gCp5+BgEVCV\r
+ 6N6iAxLmFXCQuNl0mhniDEWJ7mcT2EBsTgFHif4Zf8BGCgHVnPnxnnkCI/8CRoZVjLIpuVW6\r
+ uYmZOcWpybrFyYl5ealFusZ6uZkleqkppZsYQcHFKcm3g/HrQaVDjAIcjEo8vDfezAsQYk0s\r
+ K67MPcQoycGkJMqbrDM/QIgvKT+lMiOxOCO+qDQntfgQowQHs5IIb+0OoHLelMTKqtSifJiU\r
+ NAeLkjjvlZSb/kIC6YklqdmpqQWpRTBZGQ4OJQne6SBDBYtS01Mr0jJzShDSTBycIMN5gIY/\r
+ 0gKq4S0uSMwtzkyHyJ9iVJQS5+XQBkoIgCQySvPgemHR/4pRHOgVYd6TICt4gIkDrvsV0GAm\r
+ oMGNR+aADC5JREhJNTC6tFUym64/+MjYqC+lP/ryL7+FKvP+mF/9+7rgaZyG+C7mbe0nPspH\r
+ JB0+4cpskKrVOO87v5HcFivBf57qLnpfL1f9MZ/n63Et+TNH556nb5/HXzWJV9M2UD8h/VTm\r
+ ptvB1RVHjSYceTb53+6Px9TKJd9n1tm4Fm7Y7/Vfe0q6Widr1mShIwFKLMUZiYZazEXFiQCY\r
+ z6sX2QIAAA==\r
+Cc: sascha-ml-reply-to-2012-4@silbe.org\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: Sun, 11 Nov 2012 04:46:28 -0000\r
+\r
+This adds support for RFC 2392 mid: message ID links.\r
+---\r
+ emacs/notmuch-show.el | 45 +++++++++++++++++++++++++++++++++------------\r
+ test/emacs-show | 8 +++++++-\r
+ 2 files changed, 40 insertions(+), 13 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 49961fb..5b3e70e 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1014,23 +1014,44 @@ message at DEPTH in the current thread."\r
+ "\\)")\r
+ "The regexp used to match id: links in messages.")\r
+ \r
++(defvar notmuch-mid-regexp\r
++ ;; goto-address-url-regexp matched cid: links, which have the same\r
++ ;; grammar as the message ID part of a mid: link. Construct the\r
++ ;; regexp using the same technique as goto-address-url-regexp.\r
++ (concat "\\<mid:\\(" thing-at-point-url-path-regexp "\\)")\r
++ "The regexp used to match mid: links in messages.\r
++\r
++See RFC 2392.")\r
++\r
+ (defun notmuch-show-buttonise-links (start end)\r
+ "Buttonise URLs and mail addresses between START and END.\r
+ \r
+-This also turns id:\"<message id>\"-parts into buttons for\r
+-a corresponding notmuch search."\r
++This also turns id:\"<message id>\"-parts and mid: links into\r
++buttons for a corresponding notmuch search."\r
+ (goto-address-fontify-region start end)\r
+ (save-excursion\r
+- (goto-char start)\r
+- (while (re-search-forward notmuch-id-regexp end t)\r
+- ;; remove the overlay created by goto-address-mode\r
+- (remove-overlays (match-beginning 0) (match-end 0) 'goto-address t)\r
+- (make-text-button (match-beginning 0) (match-end 0)\r
+- 'action `(lambda (arg)\r
+- (notmuch-show ,(match-string-no-properties 0)))\r
+- 'follow-link t\r
+- 'help-echo "Mouse-1, RET: search for this message"\r
+- 'face goto-address-mail-face))))\r
++ (let (links)\r
++ (goto-char start)\r
++ (while (re-search-forward notmuch-id-regexp end t)\r
++ (push (list (match-beginning 0) (match-end 0)\r
++ (match-string-no-properties 0)) links))\r
++ (goto-char start)\r
++ (while (re-search-forward notmuch-mid-regexp end t)\r
++ (let* ((mid-cid (match-string-no-properties 1))\r
++ (mid (save-match-data\r
++ (string-match "^[^/]*" mid-cid)\r
++ (url-unhex-string (match-string 0 mid-cid)))))\r
++ (push (list (match-beginning 0) (match-end 0)\r
++ (notmuch-id-to-query mid)) links)))\r
++ (dolist (link links)\r
++ ;; Remove the overlay created by goto-address-mode\r
++ (remove-overlays (first link) (second link) 'goto-address t)\r
++ (make-text-button (first link) (second link)\r
++ 'action `(lambda (arg)\r
++ (notmuch-show ,(third link)))\r
++ 'follow-link t\r
++ 'help-echo "Mouse-1, RET: search for this message"\r
++ 'face goto-address-mail-face)))))\r
+ \r
+ ;;;###autoload\r
+ (defun notmuch-show (thread-id &optional parent-buffer query-context buffer-name)\r
+diff --git a/test/emacs-show b/test/emacs-show\r
+index 8944e73..91706ea 100755\r
+--- a/test/emacs-show\r
++++ b/test/emacs-show\r
+@@ -125,7 +125,10 @@ id:\"abc\r
+ \"\r
+ id:)\r
+ id:\r
+-cid:xxx"'\r
++cid:xxx\r
++mid:abc mid:abc/def\r
++mid:abc%20def\r
++mid:abc. mid:abc, mid:abc;"'\r
+ test_emacs '(notmuch-show "id:'$gen_msg_id'")\r
+ (notmuch-test-mark-links)\r
+ (test-visible-output)'\r
+@@ -153,6 +156,9 @@ id:"abc\r
+ id:)\r
+ id:\r
+ cid:xxx\r
++<<mid:abc>> <<mid:abc/def>>\r
++<<mid:abc%20def>>\r
++<<mid:abc>>. <<mid:abc>>, <<mid:abc>>;\r
+ EOF\r
+ test_expect_equal_file EXPECTED OUTPUT\r
+ \r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff