[gnus git] branch master updated: n0-17-356-gc40116a =1= message.el (message-completion-function): Make sure message-tab-body-function is not attempted if one of message-completion-alist fails to find a completion (bug#9158).

       via  c40116ad871a76e2052834b8f1b436eb5c86a272 (commit)
      from  ed12cb81782013074a4b5d0b3084a0d690369836 (commit)


- Log -----------------------------------------------------------------
commit c40116ad871a76e2052834b8f1b436eb5c86a272
Author: Stefan Monnier <[email protected]>
Date:   Wed Oct 26 22:23:23 2011 +0000

    message.el (message-completion-function): Make sure message-tab-body-function is not attempted if one of message-completion-alist fails to find a completion (bug#9158).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66c2363..831cbce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-26  Stefan Monnier  <[email protected]>
+
+	* message.el (message-completion-function): Make sure
+	message-tab-body-function is not attempted if one of
+	message-completion-alist fails to find a completion (bug#9158).
+
 2011-10-26  Daiki Ueno  <[email protected]>
 
 	* mml.el (mml-quote-region): Quote <#secure> tag.
@@ -7,7 +13,7 @@
 
 	* gnus-cite.el (gnus-message-citation-mode): Doc fix (in Emacs 24,
 	calling a minor mode from Lisp with nil arg enables it, so we have to
-	make the working a bit ambiguous here).
+	make the wording a bit ambiguous here).
 
 2011-10-18  Teodor Zlatanov  <[email protected]>
 
@@ -19772,7 +19778,7 @@
 	gnus-requst-update-info with explicit code to sync the in-memory
 	info read flags with the marks being sync'd to the backend.
 
-	*gnus-util.el (gnus-pp): Add optional stream to match pp API.
+	* gnus-util.el (gnus-pp): Add optional stream to match pp API.
 
 2004-09-28  Teodor Zlatanov  <[email protected]>
 
diff --git a/lisp/message.el b/lisp/message.el
index 7f56ed6..a7045da 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

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog  |   10 ++++++++--
 lisp/message.el |    6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project