>From 810e65cbe7b3e1a57fc6e5d04d2f883edb534266 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Fri, 6 Feb 2015 01:05:07 -0500 Subject: [PATCH] Check eudc-server-hotlist setting in message-expand-name * message.el (message-expand-name): Check if eudc-server-hotlist is set when deciding whether to call eudc-expand-inline. --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/message.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 32d3f08..6e2e115 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-02-06 Thomas Fitzsimmons + + * message.el (message-expand-name): Check if eudc-server-hotlist is set + when deciding whether to call eudc-expand-inline. + 2015-02-05 Teodor Zlatanov * gnus-start.el (gnus-save-newsrc-file-check-timestamp): Remove diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index a06de2a..5b7844e 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -8110,8 +8110,10 @@ (defalias 'message-completion-in-region (defun message-expand-name () (cond ((and (memq 'eudc message-expand-name-databases) - (boundp 'eudc-protocol) - eudc-protocol) + (or (and (boundp 'eudc-protocol) + eudc-protocol) + (and (boundp 'eudc-server-hotlist) + eudc-server-hotlist))) (eudc-expand-inline)) ((and (memq 'bbdb message-expand-name-databases) (fboundp 'bbdb-complete-name)) -- 1.8.1.4