X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fmessage.el;h=a7045da08ae9f4ccc68da78625944cd60bd54db7;hp=7f56ed63c4c5a68224213ffa4cb79251c44944cd;hb=c40116ad871a76e2052834b8f1b436eb5c86a272;hpb=ed12cb81782013074a4b5d0b3084a0d690369836

diff --git a/lisp/message.el b/lisp/message.el
index 7f56ed63c..a7045da08 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7932,7 +7932,11 @@ those headers."
 		(let ((mail-abbrev-mode-regexp (caar alist)))
 		  (not (mail-abbrev-in-expansion-header-p))))
       (setq alist (cdr alist)))
-    (cdar alist)))
+    (when (cdar alist)
+      (lexical-let ((fun (cdar alist)))
+        ;; Even if completion fails, return a non-nil value, so as to avoid
+        ;; falling back to message-tab-body-function.
+        (lambda () (funcall fun) 'completion-attempted)))))
 
 (eval-and-compile
   (condition-case nil