summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2011-05-26 14:00:37 +0200
committerJulien Danjou <julien@danjou.info>2011-05-26 14:00:37 +0200
commitea96f4cda674d5a0231d81d68bd7a29c60d4b0de (patch)
tree3800ac116112e7c94eeffe3fad7d752aa4675051
parentc9d01a1cc98b1cfd30b2c8abd6d18809199f943d (diff)
downloadorg-mode-ea96f4cda674d5a0231d81d68bd7a29c60d4b0de.tar.gz
org-contacts: check that completion-at-point-functions is bound
-rw-r--r--contrib/lisp/org-contacts.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/lisp/org-contacts.el b/contrib/lisp/org-contacts.el
index 6bb7abf..b32ee86 100644
--- a/contrib/lisp/org-contacts.el
+++ b/contrib/lisp/org-contacts.el
@@ -224,11 +224,6 @@ If both match values are nil, return all contacts."
(when (mail-abbrev-in-expansion-header-p)
(org-contacts-complete-name))))
-(add-hook 'message-mode-hook
- (lambda ()
- (add-to-list 'completion-at-point-functions
- 'org-contacts-message-complete-function)))
-
(defun org-contacts-gnus-get-name-email ()
"Get name and email address from Gnus message."
(gnus-with-article-headers
@@ -403,6 +398,12 @@ This adds `org-contacts-gnus-check-mail-address' and
(add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-check-mail-address)
(add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-store-last-mail))
+(when (boundp 'completion-at-point-functions)
+ (add-hook 'message-mode-hook
+ (lambda ()
+ (add-to-list 'completion-at-point-functions
+ 'org-contacts-message-complete-function))))
+
(defun org-contacts-wl-get-from-header-content ()
"Retrieve the content of the `From' header of an email.
Works from wl-summary-mode and mime-view-mode - that is while viewing email.