diff options
Diffstat (limited to 'lisp/mail/mailabbrev.el')
| -rw-r--r-- | lisp/mail/mailabbrev.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el index 271875e340c..981be8b6a98 100644 --- a/lisp/mail/mailabbrev.el +++ b/lisp/mail/mailabbrev.el @@ -182,7 +182,8 @@ no aliases, which is represented by this being a table with no entries.)") (nth 5 (file-attributes mail-personal-alias-file))) (build-mail-abbrevs))) (mail-abbrevs-sync-aliases) - (add-hook 'abbrev-expand-functions 'mail-abbrev-expand-wrapper nil t) + (add-function :around (local 'abbrev-expand-function) + #'mail-abbrev-expand-wrapper) (abbrev-mode 1)) (defun mail-abbrevs-enable () @@ -472,10 +473,12 @@ of a mail alias. The value is set up, buffer-local, when first needed.") (defun mail-abbrev-expand-wrapper (expand) (if (and mail-abbrevs (not (eq mail-abbrevs t))) - (if (mail-abbrev-in-expansion-header-p) + (if (or (mail-abbrev-in-expansion-header-p) + ;; Necessary for `message-read-from-minibuffer' to work. + (window-minibuffer-p)) - ;; We are in a To: (or CC:, or whatever) header, and - ;; should use word-abbrevs to expand mail aliases. + ;; We are in a To: (or CC:, or whatever) header or a minibuffer, + ;; and should use word-abbrevs to expand mail aliases. (let ((local-abbrev-table mail-abbrevs)) ;; Before anything else, resolve aliases if they need it. |