[Emacs-diffs] /srv/bzr/emacs/trunk r105775: message.el (message-read-from-minibuffer): Make abbrev expansion work.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 105775
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2011-09-15 01:08:08 +0000
message:
  message.el (message-read-from-minibuffer): Make abbrev expansion work.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-09-12 09:12:46 +0000
+++ b/lisp/gnus/ChangeLog       2011-09-15 01:08:08 +0000
@@ -1,3 +1,7 @@
+2011-09-15  Katsumi Yamaoka  <address@hidden>
+
+       * message.el (message-read-from-minibuffer): Make abbrev expansion work.
+
 2011-09-12  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus.el (gnus-interactive-exit): Update defcustom spec.

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-09-11 18:30:07 +0000
+++ b/lisp/gnus/message.el      2011-09-15 01:08:08 +0000
@@ -8068,10 +8068,10 @@
 (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))))