org-contacts: make Gnus usage optional

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2011-04-09 14:10:29 +02:00
parent ad99d80ad3
commit 2f0d7e94dd

View file

@ -37,9 +37,7 @@
;;; Code: ;;; Code:
(eval-and-compile (eval-and-compile
(require 'org) (require 'org))
(require 'gnus)
(require 'gnus-art))
(defgroup org-contacts nil (defgroup org-contacts nil
"Options concerning contacts management." "Options concerning contacts management."
@ -253,8 +251,6 @@ If both match values are nil, return all contacts."
;; show the next heading ;; show the next heading
(org-flag-heading nil))))))) (org-flag-heading nil)))))))
(define-key gnus-summary-mode-map ";" 'org-contacts-gnus-article-from-goto)
(defun org-contacts-anniversaries (&optional field format) (defun org-contacts-anniversaries (&optional field format)
"Compute FIELD anniversary for each contact, returning FORMAT. "Compute FIELD anniversary for each contact, returning FORMAT.
Default FIELD value is \"BIRTHDAY\". Default FIELD value is \"BIRTHDAY\".
@ -323,8 +319,6 @@ This function should be called from `gnus-article-prepare-hook'."
(link (gnus-with-article-buffer (org-store-link nil)))) (link (gnus-with-article-buffer (org-store-link nil))))
(org-set-property org-contacts-last-read-mail-property link))))))) (org-set-property org-contacts-last-read-mail-property link)))))))
(add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-store-last-mail)
(defun org-contacts-icon-as-string () (defun org-contacts-icon-as-string ()
(let ((image (org-contacts-get-icon))) (let ((image (org-contacts-get-icon)))
(concat (concat
@ -386,7 +380,17 @@ This function should be called from `gnus-article-prepare-hook'."
(org-with-point-at marker (org-with-point-at marker
(org-contacts-check-mail-address (cadr (org-contacts-gnus-get-name-email))))))) (org-contacts-check-mail-address (cadr (org-contacts-gnus-get-name-email)))))))
(defun org-contacts-gnus-insinuate ()
"Add some hooks for Gnus user.
This adds `org-contacts-gnus-check-mail-address' and
`org-contacts-gnus-store-last-mail' to
`gnus-article-prepare-hook'. It also adds a binding on `;' in
`gnus-summary-mode-map' to `org-contacts-gnus-article-from-goto'"
(require 'gnus)
(require 'gnus-art)
(define-key gnus-summary-mode-map ";" 'org-contacts-gnus-article-from-goto)
(add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-check-mail-address) (add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-check-mail-address)
(add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-store-last-mail))
(defun org-contacts-view-send-email (&optional ask) (defun org-contacts-view-send-email (&optional ask)
"Send email to the contact at point. "Send email to the contact at point.