From: Katsumi Yamaoka Date: Thu, 15 Sep 2011 01:07:42 +0000 (+0000) Subject: message.el (message-read-from-minibuffer): Make abbrev expansion work. X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=ad9fa1e0fa62f0757171074c54c239880721d2ae message.el (message-read-from-minibuffer): Make abbrev expansion work. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8b5f7e67d..fd510f79a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-09-15 Katsumi Yamaoka + + * message.el (message-read-from-minibuffer): Make abbrev expansion work. + 2011-09-12 Lars Magne Ingebrigtsen * gnus.el (gnus-interactive-exit): Update defcustom spec. diff --git a/lisp/message.el b/lisp/message.el index 6f37f83b9..0183b8727 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -8112,10 +8112,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))))