From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tokuya Kameshima <kames@fa2.so-net.ne.jp>
Subject: patch for Wanderlust 2.15.5
Date: Tue, 20 Feb 2007 00:02:29 +0900
Message-ID: <uejom9omy.wl%kames@fa2.so-net.ne.jp>
Mime-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen")
Content-Type: text/plain; charset=US-ASCII
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HJA2P-00058v-Nn
	for emacs-orgmode@gnu.org; Mon, 19 Feb 2007 10:02:45 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HJA2O-00058g-7F
	for emacs-orgmode@gnu.org; Mon, 19 Feb 2007 10:02:45 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HJA2O-00058d-0d
	for emacs-orgmode@gnu.org; Mon, 19 Feb 2007 10:02:44 -0500
Received: from mx52.ms.so-net.ne.jp ([202.238.83.2])
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1HJA2N-0006LF-5X
	for emacs-orgmode@gnu.org; Mon, 19 Feb 2007 10:02:43 -0500
Received: from toridge.kames.fa2.so-net.ne.jp
	(pddf188.tkyoac00.ap.so-net.ne.jp [218.221.241.136])
	by mx52.ms.so-net.ne.jp  with ESMTP id l1JF2UVK004814
	for <emacs-orgmode@gnu.org>; Tue, 20 Feb 2007 00:02:30 +0900 (JST)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

Hello.

Recently, I have started using org-mode found it's very great tool.

I have a problem to access the 'wl' links in org-mode, where I uses
Wanderlust to visit the imap folders.  This is my patch to org.el 4.65
for Wanderlust 2.15.5.

Thanks.
--Tokuya


--- org.el-4.65	Sat Feb 17 23:44:37 2007
+++ org.el	Mon Feb 19 14:37:38 2007
@@ -9000,7 +9000,8 @@
 		  (elmo-msgdb-overview-get-entity
 		   msgnum (wl-summary-buffer-msgdb))))
 	     (from (wl-summary-line-from))
-	     (subject (wl-summary-line-subject))) ; FIXME: untested
+	     (subject (let (wl-thr-indent-string wl-parent-message-entity)
+			(wl-summary-line-subject))))
 	(org-store-link-props :type "wl" :from from :to "???"
 			      :subject subject :message-id message-id)
 	(setq message-id (org-remove-angle-brackets message-id))
@@ -10072,10 +10073,19 @@
 
 (defun org-follow-wl-link (folder article)
   "Follow a Wanderlust link to FOLDER and ARTICLE."
-  (setq article (org-add-angle-brackets article))
+  (if (and (string= folder "%")
+	   article
+	   (string-match "^\\([^#]+\\)\\(#\\(.*\\)\\)?" article))
+      ;; XXX: imap-uw supports folders starting with '#' such as "#mh/inbox".
+      ;; Thus, we recompose folder and article ids.
+      (setq folder (format "%s#%s" folder (match-string 1 article))
+	    article (match-string 3 article)))
+  (if (not (elmo-folder-exists-p (wl-folder-get-elmo-folder folder)))
+      (error "No such folder: %s" folder))
   (wl-summary-goto-folder-subr folder 'no-sync t nil t nil nil)
-  (if article (wl-summary-jump-to-msg-by-message-id article))
-  (wl-summary-redisplay))
+  (and article
+       (wl-summary-jump-to-msg-by-message-id (org-add-angle-brackets article))
+       (wl-summary-redisplay)))
 
 (defun org-follow-rmail-link (folder article)
   "Follow an RMAIL link to FOLDER and ARTICLE."