diff options
Diffstat (limited to 'lisp/gnus/message.el')
| -rw-r--r-- | lisp/gnus/message.el | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 03ffe2fb2eb..2171dcf3edc 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -8140,13 +8140,9 @@ regexp VARSTR." "Read from the minibuffer while providing abbrev expansion." (if (fboundp 'mail-abbrevs-setup) (let ((minibuffer-setup-hook 'mail-abbrevs-setup) - (minibuffer-local-map message-minibuffer-local-map) - (orig-m-a-i-e-h-p (symbol-function - 'mail-abbrev-in-expansion-header-p))) - (fset 'mail-abbrev-in-expansion-header-p (lambda (&rest args) t)) - (unwind-protect - (read-from-minibuffer prompt initial-contents) - (fset 'mail-abbrev-in-expansion-header-p orig-m-a-i-e-h-p))) + (minibuffer-local-map message-minibuffer-local-map)) + (gmm-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)))) |