message.el (message-completion-function): Make sure message-tab-body-function is...

[gnus] / lisp / message.el

diff --git a/lisp/message.el b/lisp/message.el
index 7f56ed6..a7045da 100644 (file)
--- 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