summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLomax Escarmant <lomax.e@gmail.com>2011-08-06 11:45:26 +0200
committerJulien Danjou <julien@danjou.info>2011-08-06 11:45:26 +0200
commitd3b088e017763a78e2928f6533171de130bd6dcf (patch)
tree6c08bfa71d7ebec5a76dda1fcb5babfa2c7fa136
parentafa0df9b4709e1af7b7b0cde550a71ec6377c49d (diff)
downloadorg-mode-d3b088e017763a78e2928f6533171de130bd6dcf.tar.gz
org-contacts: fix errors when Gnus or ERC are not loaded
Signed-off-by: Julien Danjou <julien@danjou.info>
-rw-r--r--contrib/lisp/org-contacts.el16
1 files changed, 9 insertions, 7 deletions
diff --git a/contrib/lisp/org-contacts.el b/contrib/lisp/org-contacts.el
index f846fe2..545e90e 100644
--- a/contrib/lisp/org-contacts.el
+++ b/contrib/lisp/org-contacts.el
@@ -239,9 +239,10 @@ If both match values are nil, return all contacts."
(defun org-contacts-gnus-get-name-email ()
"Get name and email address from Gnus message."
- (gnus-with-article-headers
- (mail-extract-address-components
- (or (mail-fetch-field "From") ""))))
+ (if (gnus-alive-p)
+ (gnus-with-article-headers
+ (mail-extract-address-components
+ (or (mail-fetch-field "From") "")))))
(defun org-contacts-gnus-article-from-get-marker ()
"Return a marker for a contact based on From."
@@ -533,10 +534,11 @@ If ASK is set, ask for the email address even if there's only one address."
(defun erc-nicknames-list ()
"Return all nicknames of all ERC buffers."
- (loop for buffer in (erc-buffer-list)
- nconc (with-current-buffer buffer
- (loop for user-entry in (mapcar 'car (erc-get-channel-user-list))
- collect (elt user-entry 1)))))
+ (if (fboundp 'erc-buffer-list)
+ (loop for buffer in (erc-buffer-list)
+ nconc (with-current-buffer buffer
+ (loop for user-entry in (mapcar 'car (erc-get-channel-user-list))
+ collect (elt user-entry 1))))))
(add-to-list 'org-property-set-functions-alist
`(,org-contacts-nickname-property . org-contacts-completing-read-nickname))