message.el (message-read-from-minibuffer): Make abbrev expansion work.

2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a89dc713dd8..39afcb0cef6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * message.el (message-read-from-minibuffer): Make abbrev expansion work.
+
 2011-09-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.el (gnus-interactive-exit): Update defcustom spec.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index f78e2b0339d..8dac0fd7afe 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -8068,10 +8068,10 @@ regexp VARSTR."
 (defun message-read-from-minibuffer (prompt &optional initial-contents)
   "Read from the minibuffer while providing abbrev expansion."
   (if (fboundp 'mail-abbrevs-setup)
-      (let ((mail-abbrev-mode-regexp "")
-            (minibuffer-setup-hook 'mail-abbrevs-setup)
+      (let ((minibuffer-setup-hook 'mail-abbrevs-setup)
             (minibuffer-local-map message-minibuffer-local-map))
-        (read-from-minibuffer prompt initial-contents))
+        (flet ((mail-abbrev-in-expansion-header-p nil t))
+          (read-from-minibuffer prompt initial-contents)))
     (let ((minibuffer-setup-hook 'mail-abbrev-minibuffer-setup-hook)
           (minibuffer-local-map message-minibuffer-local-map))
       (read-string prompt initial-contents))))