forked from mirrors/org-mode
Improved links to usenet messages on the web.
Tassilo Horn writes: here's the promised refactoring of org-gnus.el: - Rename org-usenet-links-prefer-google to org-gnus-prefer-web-links - Make that option work for gmane - Only make weblinks if the article is in a newsgroup - Only make weblinks if the article has no X-No-Archive header There is little drawback: - Gnus stored some headers in an array and makes them instantly available. Unfortunately that doesn't apply to X-No-Archive, so I have to select and widen the article buffer and parse anew.
This commit is contained in:
parent
dda012aca5
commit
ac14d29565
|
@ -3,6 +3,7 @@
|
||||||
;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
||||||
|
;; Tassilo Horn <tassilo at member dot fsf dot org>
|
||||||
;; Keywords: outlines, hypermedia, calendar, wp
|
;; Keywords: outlines, hypermedia, calendar, wp
|
||||||
;; Homepage: http://orgmode.org
|
;; Homepage: http://orgmode.org
|
||||||
;; Version: 6.12trans
|
;; Version: 6.12trans
|
||||||
|
@ -37,7 +38,11 @@
|
||||||
|
|
||||||
;; Customization variables
|
;; Customization variables
|
||||||
|
|
||||||
(defcustom org-usenet-links-prefer-google nil
|
(when (fboundp 'defvaralias)
|
||||||
|
(defvaralias 'org-usenet-links-prefer-google 'org-gnus-prefer-web-links
|
||||||
|
"Deprecated name for `org-gnus-prefer-web-links'."))
|
||||||
|
|
||||||
|
(defcustom org-gnus-prefer-web-links nil
|
||||||
"Non-nil means, `org-store-link' will create web links to Google groups.
|
"Non-nil means, `org-store-link' will create web links to Google groups.
|
||||||
When nil, Gnus will be used for such links.
|
When nil, Gnus will be used for such links.
|
||||||
Using a prefix arg to the command \\[org-store-link] (`org-store-link')
|
Using a prefix arg to the command \\[org-store-link] (`org-store-link')
|
||||||
|
@ -57,11 +62,36 @@ negates this setting for the duration of the command."
|
||||||
(add-hook 'org-store-link-functions 'org-gnus-store-link)
|
(add-hook 'org-store-link-functions 'org-gnus-store-link)
|
||||||
|
|
||||||
;; Implementation
|
;; Implementation
|
||||||
|
|
||||||
|
(defun org-gnus-group-link (group)
|
||||||
|
(debug)
|
||||||
|
|
||||||
|
(let ((unprefixed-group (replace-regexp-in-string "^[^:]+:" "" group)))
|
||||||
|
(if (and (string-match "^nntp" group) ;; Only for nntp groups
|
||||||
|
(org-xor current-prefix-arg
|
||||||
|
org-gnus-prefer-web-links))
|
||||||
|
(concat (if (string-match "gmane" unprefixed-group)
|
||||||
|
"http://news.gmane.org/"
|
||||||
|
"http://groups.google.com/group/")
|
||||||
|
unprefixed-group)
|
||||||
|
(concat "gnus:" group))))
|
||||||
|
|
||||||
|
(defun org-gnus-article-link (group newsgroups message-id x-no-archive)
|
||||||
|
(if (and (org-xor current-prefix-arg org-gnus-prefer-web-links)
|
||||||
|
newsgroups ;; Make web links only for nntp groups
|
||||||
|
(not x-no-archive)) ;; and if X-No-Archive isn't set.
|
||||||
|
(format (if (string-match "gmane\\." newsgroups)
|
||||||
|
"http://mid.gmane.org/%s"
|
||||||
|
"http://groups.google.com/groups/search?as_umsgid=%s")
|
||||||
|
(org-fixup-message-id-for-http
|
||||||
|
(replace-regexp-in-string "[<>]" "" message-id)))
|
||||||
|
(org-make-link "gnus:" group "#" message-id)))
|
||||||
|
|
||||||
(defun org-gnus-store-link ()
|
(defun org-gnus-store-link ()
|
||||||
"Store a link to a Gnus folder or message."
|
"Store a link to a Gnus folder or message."
|
||||||
(cond
|
(cond
|
||||||
((eq major-mode 'gnus-group-mode)
|
((eq major-mode 'gnus-group-mode)
|
||||||
(let ((group (cond ((fboundp 'gnus-group-group-name) ; depending on Gnus
|
(let* ((group (cond ((fboundp 'gnus-group-group-name) ; depending on Gnus
|
||||||
(gnus-group-group-name)) ; version
|
(gnus-group-group-name)) ; version
|
||||||
((fboundp 'gnus-group-name)
|
((fboundp 'gnus-group-name)
|
||||||
(gnus-group-name))
|
(gnus-group-name))
|
||||||
|
@ -69,38 +99,32 @@ negates this setting for the duration of the command."
|
||||||
desc link)
|
desc link)
|
||||||
(unless group (error "Not on a group"))
|
(unless group (error "Not on a group"))
|
||||||
(org-store-link-props :type "gnus" :group group)
|
(org-store-link-props :type "gnus" :group group)
|
||||||
(setq desc (concat
|
(setq desc (org-gnus-group-link group)
|
||||||
(if (org-xor current-prefix-arg
|
|
||||||
org-usenet-links-prefer-google)
|
|
||||||
"http://groups.google.com/groups?group="
|
|
||||||
"gnus:")
|
|
||||||
group)
|
|
||||||
link (org-make-link desc))
|
link (org-make-link desc))
|
||||||
(org-add-link-props :link link :description desc)
|
(org-add-link-props :link link :description desc)
|
||||||
link))
|
link))
|
||||||
|
|
||||||
((memq major-mode '(gnus-summary-mode gnus-article-mode))
|
((memq major-mode '(gnus-summary-mode gnus-article-mode))
|
||||||
(and (eq major-mode 'gnus-article-mode) (gnus-article-show-summary))
|
(and (eq major-mode 'gnus-summary-mode) (gnus-summary-show-article))
|
||||||
(let* ((group gnus-newsgroup-name)
|
(let* ((group gnus-newsgroup-name)
|
||||||
(article (gnus-summary-article-number))
|
|
||||||
(header (gnus-summary-article-header article))
|
(header (with-current-buffer gnus-article-buffer
|
||||||
(from (mail-header-from header))
|
(gnus-summary-toggle-header 1)
|
||||||
(message-id (mail-header-id header))
|
(goto-char (point-min))
|
||||||
(date (mail-header-date header))
|
(mail-header-extract-no-properties)))
|
||||||
(extra (mail-header-extra header))
|
(from (mail-header 'from header))
|
||||||
(to (cdr (assoc 'To extra)))
|
(message-id (mail-header 'message-id header))
|
||||||
|
(date (mail-header 'date header))
|
||||||
|
(to (mail-header 'to header))
|
||||||
|
(newsgroups (mail-header 'newsgroups header))
|
||||||
|
(x-no-archive (mail-header 'x-no-archive header))
|
||||||
|
|
||||||
(subject (gnus-summary-subject-string))
|
(subject (gnus-summary-subject-string))
|
||||||
desc link)
|
desc link)
|
||||||
(org-store-link-props :type "gnus" :from from :subject subject
|
(org-store-link-props :type "gnus" :from from :subject subject
|
||||||
:message-id message-id :group group :to to)
|
:message-id message-id :group group :to to)
|
||||||
(setq desc (org-email-link-description))
|
(setq desc (org-email-link-description)
|
||||||
(if (org-xor current-prefix-arg org-usenet-links-prefer-google)
|
link (org-gnus-article-link group newsgroups message-id x-no-archive))
|
||||||
(setq link
|
|
||||||
(format "http://groups.google.com/groups?as_umsgid=%s"
|
|
||||||
(org-fixup-message-id-for-http message-id)))
|
|
||||||
(setq link (org-make-link "gnus:" group "#"
|
|
||||||
(or message-id
|
|
||||||
(number-to-string article)))))
|
|
||||||
(org-add-link-props :link link :description desc)
|
(org-add-link-props :link link :description desc)
|
||||||
link))))
|
link))))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue