forked from mirrors/org-mode
Extensions to storing and opening links to Wanderlust messages.
By David Maus. The gist of the extended capabilities: - Remove filter conditions for messages in a filter folder If customization variable `org-wl-link-remove-filter' is non-nil, filter conditions are stripped of the folder name. - Create web links for messages in a Shimbun folder If customization variable `org-wl-shimbun-prefer-web-links' is non-nil, calling `org-store-link' on a Shimbun message creates a web link to the messages source, indicated in the Xref: header field. - Create web links for messages in a nntp folder If customization variable `org-wl-nntp-prefer-web-links' is non-nil, calling `org-store-link' on a nntp message creates a web link either to gmane.org if the group can be read trough gmane or to googlegroups otherwise. In both cases the message-id is used as reference. - Open links in namazu search folder If `org-wl-open' is called with one prefix, WL opens a namazu search folder for message's message-id using `org-wl-namazu-default-index' as search index. If this variable is nil or `org-wl-open' is called with two prefixes Org asks for the search index to use. Regards, -- David Conflicts: lisp/ChangeLog
This commit is contained in:
parent
bad2d177e9
commit
5d5b4fd0ad
|
@ -1,3 +1,26 @@
|
||||||
|
2010-04-13 David Maus <dmaus@ictsoc.de>
|
||||||
|
|
||||||
|
* org-wl.el (org-wl-link-remove-filter): New customizable
|
||||||
|
variable. If non-nil, filter conditions are stripped when storing
|
||||||
|
link to message in filter folder.
|
||||||
|
(org-wl-shimbun-prefer-web-links): New customizable variable. If
|
||||||
|
non-nil, links to shimbun messages are created as web links to
|
||||||
|
message source.
|
||||||
|
(org-wl-nntp-prefer-web-links): New customizable variable. If
|
||||||
|
non-nil, links to nntp message are created as web links to gmane
|
||||||
|
or googlegroups.
|
||||||
|
(org-wl-namazu-default-index): New customizable variable.
|
||||||
|
Directory of namazu search index that should be used as default
|
||||||
|
when opening a link in a search folder.
|
||||||
|
(org-wl-folder-types): New constant. Wanderlust folder type
|
||||||
|
indicators.
|
||||||
|
(org-wl-folder-type): New function. Return type of Wanderlust
|
||||||
|
folder.
|
||||||
|
(org-wl-store-link): Create web links for shimbun or nntp messages
|
||||||
|
and strip filter conditions depending on customizable variables.
|
||||||
|
(org-wl-open): Open namazu search folder for message when called
|
||||||
|
with prefix.
|
||||||
|
|
||||||
2010-04-12 Carsten Dominik <carsten.dominik@gmail.com>
|
2010-04-12 Carsten Dominik <carsten.dominik@gmail.com>
|
||||||
|
|
||||||
* org.el (org-remove-if, org-remove-if-not): New functions.
|
* org.el (org-remove-if, org-remove-if-not): New functions.
|
||||||
|
|
121
lisp/org-wl.el
121
lisp/org-wl.el
|
@ -4,6 +4,7 @@
|
||||||
;; Free Software Foundation, Inc.
|
;; Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
|
;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
|
||||||
|
;; David Maus <dmaus at ictsoc dot de>
|
||||||
;; Keywords: outlines, hypermedia, calendar, wp
|
;; Keywords: outlines, hypermedia, calendar, wp
|
||||||
;; Homepage: http://orgmode.org
|
;; Homepage: http://orgmode.org
|
||||||
;; Version: 6.35g
|
;; Version: 6.35g
|
||||||
|
@ -40,9 +41,31 @@
|
||||||
:group 'org-link)
|
:group 'org-link)
|
||||||
|
|
||||||
(defcustom org-wl-link-to-refile-destination t
|
(defcustom org-wl-link-to-refile-destination t
|
||||||
"Create a link to the refile destination if the message is marked as refile."
|
"Create a link to the refile destination if the message is marked as refile."
|
||||||
:group 'org-wl
|
:group 'org-wl
|
||||||
:type 'boolean)
|
:type 'boolean)
|
||||||
|
|
||||||
|
(defcustom org-wl-link-remove-filter nil
|
||||||
|
"Remove filter condition if message is filter folder."
|
||||||
|
:group 'org-wl
|
||||||
|
:type 'boolean)
|
||||||
|
|
||||||
|
(defcustom org-wl-shimbun-prefer-web-links nil
|
||||||
|
"If non-nil create web links for shimbun messages."
|
||||||
|
:group 'org-wl
|
||||||
|
:type 'boolean)
|
||||||
|
|
||||||
|
(defcustom org-wl-nntp-prefer-web-links nil
|
||||||
|
"If non-nil create web links for nntp messages.
|
||||||
|
When folder name contains string \"gmane\" link to gmane,
|
||||||
|
googlegroups otherwise."
|
||||||
|
:type 'boolean
|
||||||
|
:group 'org-wl)
|
||||||
|
|
||||||
|
(defcustom org-wl-namazu-default-index nil
|
||||||
|
"Default namazu search index."
|
||||||
|
:type 'directory
|
||||||
|
:group 'org-wl)
|
||||||
|
|
||||||
;; Declare external functions and variables
|
;; Declare external functions and variables
|
||||||
(declare-function elmo-folder-exists-p "ext:elmo" (folder) t)
|
(declare-function elmo-folder-exists-p "ext:elmo" (folder) t)
|
||||||
|
@ -67,11 +90,39 @@
|
||||||
(defvar wl-summary-buffer-elmo-folder)
|
(defvar wl-summary-buffer-elmo-folder)
|
||||||
(defvar wl-summary-buffer-folder-name)
|
(defvar wl-summary-buffer-folder-name)
|
||||||
|
|
||||||
|
(defconst org-wl-folder-types
|
||||||
|
'(("%" . imap) ("-" . nntp) ("+" . mh) ("=" . spool)
|
||||||
|
("$" . archive) ("&" . pop) ("@" . shimbun) ("[" . search)
|
||||||
|
("*" . multi) ("/" . filter) ("|" . pipe) ("'" . internal))
|
||||||
|
"List of folder indicators. See Wanderlust manual, section 3.")
|
||||||
|
|
||||||
|
|
||||||
;; Install the link type
|
;; Install the link type
|
||||||
(org-add-link-type "wl" 'org-wl-open)
|
(org-add-link-type "wl" 'org-wl-open)
|
||||||
(add-hook 'org-store-link-functions 'org-wl-store-link)
|
(add-hook 'org-store-link-functions 'org-wl-store-link)
|
||||||
|
|
||||||
;; Implementation
|
;; Implementation
|
||||||
|
|
||||||
|
(defun org-wl-folder-type (folder)
|
||||||
|
"Return symbol that indicicates the type of FOLDER.
|
||||||
|
FOLDER is the wanderlust folder name. The first character of the
|
||||||
|
folder name determines the the folder type."
|
||||||
|
(let* ((indicator (substring folder 0 1))
|
||||||
|
(type (cdr (assoc indicator org-wl-folder-types))))
|
||||||
|
;; maybe access or file folder
|
||||||
|
(when (not type)
|
||||||
|
(setq type
|
||||||
|
(cond
|
||||||
|
((and (>= (length folder) 5)
|
||||||
|
(string= (substring folder 0 5) "file:"))
|
||||||
|
'file)
|
||||||
|
((and (>= (length folder) 7)
|
||||||
|
(string= (substring folder 0 7) "access:"))
|
||||||
|
'access)
|
||||||
|
(t
|
||||||
|
nil))))
|
||||||
|
type))
|
||||||
|
|
||||||
(defun org-wl-store-link ()
|
(defun org-wl-store-link ()
|
||||||
"Store a link to a WL folder or message."
|
"Store a link to a WL folder or message."
|
||||||
(when (eq major-mode 'wl-summary-mode)
|
(when (eq major-mode 'wl-summary-mode)
|
||||||
|
@ -83,6 +134,7 @@
|
||||||
(equal (nth 1 mark-info) "o")) ; marked as refile
|
(equal (nth 1 mark-info) "o")) ; marked as refile
|
||||||
(nth 2 mark-info)
|
(nth 2 mark-info)
|
||||||
wl-summary-buffer-folder-name))
|
wl-summary-buffer-folder-name))
|
||||||
|
(folder-type (org-wl-folder-type folder-name))
|
||||||
(message-id (elmo-message-field wl-summary-buffer-elmo-folder
|
(message-id (elmo-message-field wl-summary-buffer-elmo-folder
|
||||||
msgnum 'message-id))
|
msgnum 'message-id))
|
||||||
(wl-message-entity
|
(wl-message-entity
|
||||||
|
@ -101,36 +153,75 @@
|
||||||
(if (listp to-field)
|
(if (listp to-field)
|
||||||
(car to-field)
|
(car to-field)
|
||||||
to-field)))
|
to-field)))
|
||||||
|
(xref (let ((xref-field (elmo-message-entity-field wl-message-entity
|
||||||
|
'xref)))
|
||||||
|
(if (listp xref-field)
|
||||||
|
(car xref-field)
|
||||||
|
xref-field)))
|
||||||
(subject (let (wl-thr-indent-string wl-parent-message-entity)
|
(subject (let (wl-thr-indent-string wl-parent-message-entity)
|
||||||
(wl-summary-line-subject)))
|
(wl-summary-line-subject)))
|
||||||
desc link)
|
desc link)
|
||||||
|
|
||||||
;; remove text properties of subject string to avoid possible bug
|
;; remove text properties of subject string to avoid possible bug
|
||||||
;; when formatting the subject
|
;; when formatting the subject
|
||||||
|
;; (Emacs bug #5306, fixed)
|
||||||
(set-text-properties 0 (length subject) nil subject)
|
(set-text-properties 0 (length subject) nil subject)
|
||||||
|
|
||||||
(org-store-link-props :type "wl" :from from :to to
|
;; maybe remove filter condition
|
||||||
:subject subject :message-id message-id)
|
(when (and (eq folder-type 'filter) org-wl-link-remove-filter)
|
||||||
(setq message-id (org-remove-angle-brackets message-id))
|
(while (eq (org-wl-folder-type folder-name) 'filter)
|
||||||
(setq desc (org-email-link-description))
|
(setq folder-name
|
||||||
(setq link (org-make-link "wl:" folder-name
|
(replace-regexp-in-string "^/[^/]+/" "" folder-name))))
|
||||||
"#" message-id))
|
|
||||||
(org-add-link-props :link link :description desc)
|
;; maybe create http link
|
||||||
link)))
|
(cond
|
||||||
|
((and (eq folder-type 'shimbun) org-wl-shimbun-prefer-web-links xref)
|
||||||
|
(org-store-link-props :type "http" :link xref :description subject
|
||||||
|
:from from :to to :message-id message-id
|
||||||
|
:subject subject))
|
||||||
|
((and (eq folder-type 'nntp) org-wl-nntp-prefer-web-links)
|
||||||
|
(setq link (format
|
||||||
|
(if (string-match "gmane\\." folder-name)
|
||||||
|
"http://mid.gmane.org/%s"
|
||||||
|
"http://groups.google.com/groups/search?as_umsgid=%s")
|
||||||
|
(org-fixup-message-id-for-http message-id)))
|
||||||
|
(org-store-link-props :type "http" :link link :description subject
|
||||||
|
:from from :to to :message-id message-id
|
||||||
|
:subject subject))
|
||||||
|
(t
|
||||||
|
(org-store-link-props :type "wl" :from from :to to
|
||||||
|
:subject subject :message-id message-id)
|
||||||
|
(setq message-id (org-remove-angle-brackets message-id))
|
||||||
|
(setq desc (org-email-link-description))
|
||||||
|
(setq link (org-make-link "wl:" folder-name "#" message-id))
|
||||||
|
(org-add-link-props :link link :description desc)))
|
||||||
|
(or link xref))))
|
||||||
|
|
||||||
(defun org-wl-open (path)
|
(defun org-wl-open (path)
|
||||||
"Follow the WL message link specified by PATH."
|
"Follow the WL message link specified by PATH.
|
||||||
|
When called with one prefix, open message in namazu search folder
|
||||||
|
with `org-wl-namazu-default-index' as search index. When called
|
||||||
|
with two prefixes or `org-wl-namazu-default-index' is nil, ask
|
||||||
|
for namazu index."
|
||||||
(require 'wl)
|
(require 'wl)
|
||||||
(unless wl-init (wl))
|
(unless wl-init (wl))
|
||||||
;; XXX: The imap-uw's MH folder names start with "%#".
|
;; XXX: The imap-uw's MH folder names start with "%#".
|
||||||
(if (not (string-match "\\`\\(\\(?:%#\\)?[^#]+\\)\\(#\\(.*\\)\\)?" path))
|
(if (not (string-match "\\`\\(\\(?:%#\\)?[^#]+\\)\\(#\\(.*\\)\\)?" path))
|
||||||
(error "Error in Wanderlust link"))
|
(error "Error in Wanderlust link"))
|
||||||
(let ((folder (match-string 1 path))
|
(let ((folder (match-string 1 path))
|
||||||
(article (match-string 3 path)))
|
(article (match-string 3 path)))
|
||||||
|
;; maybe open message in namazu search folder
|
||||||
|
(when current-prefix-arg
|
||||||
|
(setq folder (concat "[" article "]"
|
||||||
|
(if (and (equal current-prefix-arg '(4))
|
||||||
|
org-wl-namazu-default-index)
|
||||||
|
org-wl-namazu-default-index
|
||||||
|
(read-directory-name "Namazu index: ")))))
|
||||||
(if (not (elmo-folder-exists-p (org-no-warnings
|
(if (not (elmo-folder-exists-p (org-no-warnings
|
||||||
(wl-folder-get-elmo-folder folder))))
|
(wl-folder-get-elmo-folder folder))))
|
||||||
(error "No such folder: %s" folder))
|
(error "No such folder: %s" folder))
|
||||||
(let ((old-buf (current-buffer))
|
(let ((old-buf (current-buffer))
|
||||||
(old-point (point-marker)))
|
(old-point (point-marker)))
|
||||||
(wl-folder-goto-folder-subr folder)
|
(wl-folder-goto-folder-subr folder)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
;; XXX: `wl-folder-goto-folder-subr' moves point to the
|
;; XXX: `wl-folder-goto-folder-subr' moves point to the
|
||||||
|
|
Loading…
Reference in New Issue