From mboxrd@z Thu Jan  1 00:00:00 1970
From: Friedrich Delgado <friedel@nomaden.org>
Subject: org-notmuch outdated
Date: Mon, 20 Aug 2012 13:32:15 +0200
Message-ID: <20120820113215.GA2564@pre-sense.de>
Reply-To: friedel@nomaden.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:40172)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <friedel@nomaden.org>) id 1T3QDT-0001Ni-P0
	for emacs-orgmode@gnu.org; Mon, 20 Aug 2012 07:32:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <friedel@nomaden.org>) id 1T3QDS-00005d-GE
	for emacs-orgmode@gnu.org; Mon, 20 Aug 2012 07:32:19 -0400
Received: from mail.pre-sense.de ([213.238.39.107]:38961)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <friedel@nomaden.org>) id 1T3QDS-00005O-A8
	for emacs-orgmode@gnu.org; Mon, 20 Aug 2012 07:32:18 -0400
Received: from smtp.pre-sense.de (tetris_b.pre-sense.de [10.9.0.76])
	by mail.pre-sense.de (Postfix) with ESMTP id 3414D5E00B
	for <emacs-orgmode@gnu.org>; Mon, 20 Aug 2012 13:32:16 +0200 (CEST)
Received: from orion.pre-sense.de (unknown [193.174.12.196])
	by smtp.pre-sense.de (Postfix) with ESMTPS id 19E68C261E
	for <emacs-orgmode@gnu.org>; Mon, 20 Aug 2012 13:32:16 +0200 (CEST)
Content-Disposition: inline
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Emacs-orgmode mailing list <emacs-orgmode@gnu.org>

diff --git a/contrib/lisp/org-notmuch.el b/contrib/lisp/org-notmuch.el
index 25f6ab6..20f98c3 100644
--- a/contrib/lisp/org-notmuch.el
+++ b/contrib/lisp/org-notmuch.el
@@ -58,7 +58,7 @@
       (org-store-link-props :type "notmuch" :from from :to to
                             :subject subject :message-id message-id)
       (setq desc (org-email-link-description))
-      (setq link (org-make-link "notmuch:"  "id:" message-id))
+      (setq link (concat "notmuch:"  "id:" message-id))
       (org-add-link-props :link link :description desc)
       link)))

@@ -82,7 +82,7 @@ Can link to more than one message, if so all matching messages are shown."
 (defun org-notmuch-search-store-link ()
   "Store a link to a notmuch search or message."
   (when (eq major-mode 'notmuch-search-mode)
-    (let ((link (org-make-link "notmuch-search:"
+    (let ((link (concat "notmuch-search:"
                         (org-link-escape notmuch-search-query-string)))
           (desc (concat "Notmuch search: " notmuch-search-query-string)))
       (org-store-link-props :type "notmuch-search"