Hi,

The latest version of notmuch (actually for quite a while now) ships
with an alternate nicely threaded search interface called notmuch-tree.
Earlier this was in contrib, but now it is part of core.  So I thought
it would be nice to use that to follow org-notmuch links.

Attached are two patches: the first adds the customize options, the
second provides a function that uses notmuch-tree to follow links.  The
defaults are set to the old behaviour, so this should not cause any
surprises.

I have done some light testing, and the patches seem to behave nicely.

Cheers,

-- 
Suvayu

Open source is the future. It sets us free.
>From bf01edab91f50a6360e142a3762ad259e1db3f05 Mon Sep 17 00:00:00 2001
From: Suvayu Ali <fatkasuvayu+li...@gmail.com>
Date: Wed, 16 Jul 2014 18:08:36 +0200
Subject: [PATCH 1/2] contrib/lisp/org-notmuch.el: customisable notmuch open
 functions

* contrib/lisp/org-notmuch.el: org-notmuch-open-function,
  org-notmuch-open-search-function: New defcustoms, can be used to set
  custom notmuch-open functions.
---
 contrib/lisp/org-notmuch.el | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/contrib/lisp/org-notmuch.el b/contrib/lisp/org-notmuch.el
index 2ab5c17..e6dbfa6 100644
--- a/contrib/lisp/org-notmuch.el
+++ b/contrib/lisp/org-notmuch.el
@@ -41,6 +41,29 @@
 
 (require 'org)
 
+;; customisable notmuch open functions
+(defcustom org-notmuch-open-function
+  'org-notmuch-follow-link
+  "Function used to follow notmuch links.
+
+Should accept a notmuch search string as the sole argument."
+  :group 'org-notmuch
+  :version "24.4"
+  :package-version '(Org . "8.0")
+  :type 'function)
+
+(defcustom org-notmuch-search-open-function
+  'org-notmuch-search-follow-link
+  "Function used to follow notmuch-search links.
+
+Should accept a notmuch search string as the sole argument."
+  :group 'org-notmuch
+  :version "24.4"
+  :package-version '(Org . "8.0")
+  :type 'function)
+
+
+
 ;; Install the link type
 (org-add-link-type "notmuch" 'org-notmuch-open)
 (add-hook 'org-store-link-functions 'org-notmuch-store-link)
@@ -62,7 +85,7 @@
 
 (defun org-notmuch-open (path)
   "Follow a notmuch message link specified by PATH."
-  (org-notmuch-follow-link path))
+  (funcall org-notmuch-open-function path))
 
 (defun org-notmuch-follow-link (search)
   "Follow a notmuch link to SEARCH.
@@ -91,7 +114,7 @@ Can link to more than one message, if so all matching 
messages are shown."
 (defun org-notmuch-search-open (path)
   "Follow a notmuch message link specified by PATH."
   (message path)
-  (org-notmuch-search-follow-link path))
+  (funcall org-notmuch-search-open-function path))
 
 (defun org-notmuch-search-follow-link (search)
   "Follow a notmuch link by displaying SEARCH in notmuch-search mode."
-- 
1.9.3

>From 0aad539c541d4c17cd1ba2c414902a859419efee Mon Sep 17 00:00:00 2001
From: Suvayu Ali <fatkasuvayu+li...@gmail.com>
Date: Wed, 16 Jul 2014 18:17:56 +0200
Subject: [PATCH 2/2] contrib/lisp/org-notmuch.el: new notmuch open function

* contrib/lisp/org-notmuch.el: org-notmuch-tree-follow-link: New function,
  can be used to follow notmuch or notmuch-search links.
---
 contrib/lisp/org-notmuch.el | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/contrib/lisp/org-notmuch.el b/contrib/lisp/org-notmuch.el
index e6dbfa6..ae9b50b 100644
--- a/contrib/lisp/org-notmuch.el
+++ b/contrib/lisp/org-notmuch.el
@@ -121,6 +121,13 @@ Can link to more than one message, if so all matching 
messages are shown."
   (require 'notmuch)
   (notmuch-search (org-link-unescape search)))
 
+
+
+(defun org-notmuch-tree-follow-link (search)
+  "Follow a notmuch link by displaying SEARCH in notmuch-tree mode."
+  (require 'notmuch)
+  (notmuch-tree (org-link-unescape search)))
+
 (provide 'org-notmuch)
 
 ;;; org-notmuch.el ends here
-- 
1.9.3

Reply via email to