From: Pierre Neidhardt <mail@ambrevar.xyz>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: emacs-orgmode@gnu.org
Subject: Re: org-notmuch: Improved tree support
Date: Tue, 09 Apr 2019 19:23:55 +0200 [thread overview]
Message-ID: <87v9zn6qj8.fsf@ambrevar.xyz> (raw)
In-Reply-To: <87k1gbichc.fsf@nicolasgoaziou.fr>
[-- Attachment #1.1: Type: text/plain, Size: 142 bytes --]
Patch attached.
I'm just not sure about what the version number should be for
deprecation.
--
Pierre Neidhardt
https://ambrevar.xyz/
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ol-notmuch-Make-distinct-link-types-for-search-view-.patch --]
[-- Type: text/x-patch, Size: 2673 bytes --]
From 52191a549c5a75495d9e9be864a42c7906bdfdd3 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Tue, 9 Apr 2019 19:15:22 +0200
Subject: [PATCH] ol-notmuch: Make distinct link types for search view and tree
view
* contrib/lisp/ol-notmuch.el (org-notmuch-search-open-function): Deprecate.
(org-notmuch-tree-store-link): New function.
(org-notmuch-tree-open): New function.
"notmuch-tree": Set new "notmuch-tree" parameters with the above functions.
---
contrib/lisp/ol-notmuch.el | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/contrib/lisp/ol-notmuch.el b/contrib/lisp/ol-notmuch.el
index ab4ddacf2..eac8a37ca 100644
--- a/contrib/lisp/ol-notmuch.el
+++ b/contrib/lisp/ol-notmuch.el
@@ -57,11 +57,14 @@ Should accept a notmuch search string as the sole argument."
'org-notmuch-search-follow-link
"Function used to follow notmuch-search links.
-Should accept a notmuch search string as the sole argument."
+Should accept a notmuch search string as the sole argument.
+
+This is obsolete and `org-notmuch-search-follow-link' will always be used."
:group 'org-notmuch
:version "24.4"
:package-version '(Org . "8.0")
:type 'function)
+(make-obsolete-variable 'org-notmuch-search-open-function nil "26.2") ; TODO: What is the right version?
\f
@@ -116,7 +119,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 "%s" path)
- (funcall org-notmuch-search-open-function path))
+ (org-notmuch-search-follow-link path))
(defun org-notmuch-search-follow-link (search)
"Follow a notmuch link by displaying SEARCH in notmuch-search mode."
@@ -125,6 +128,25 @@ Can link to more than one message, if so all matching messages are shown."
\f
+(org-link-set-parameters "notmuch-tree"
+ :follow #'org-notmuch-tree-open
+ :store #'org-notmuch-tree-store-link)
+
+(defun org-notmuch-tree-store-link ()
+ "Store a link to a notmuch search or message."
+ (when (eq major-mode 'notmuch-tree-mode)
+ (let ((link (concat "notmuch-tree:" (notmuch-tree-get-query)))
+ (desc (concat "Notmuch tree: " (notmuch-tree-get-query))))
+ (org-store-link-props :type "notmuch-tree"
+ :link link
+ :description desc)
+ link)))
+
+(defun org-notmuch-tree-open (path)
+ "Follow a notmuch message link specified by PATH."
+ (message "%s" path)
+ (org-notmuch-tree-follow-link path))
+
(defun org-notmuch-tree-follow-link (search)
"Follow a notmuch link by displaying SEARCH in notmuch-tree mode."
(require 'notmuch)
--
2.21.0
next prev parent reply other threads:[~2019-04-09 17:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-19 10:07 org-notmuch: Improved tree support Pierre Neidhardt
2019-04-03 10:56 ` Nicolas Goaziou
2019-04-09 17:23 ` Pierre Neidhardt [this message]
2019-04-10 13:19 ` Nicolas Goaziou
2019-04-10 13:27 ` Pierre Neidhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87v9zn6qj8.fsf@ambrevar.xyz \
--to=mail@ambrevar.xyz \
--cc=emacs-orgmode@gnu.org \
--cc=mail@nicolasgoaziou.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).