*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e51b6a8..bc4f3f3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+1999-11-05 20:28:27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-read-from-minibuffer): New function.
+
 Fri Nov  5 19:10:02 1999  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Pterodactyl Gnus v0.98 is released.

diff --git a/lisp/message.el b/lisp/message.el
index c3350a8..6d2c19e 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3835,10 +3835,7 @@ Optional NEWS will use news to forward instead of mail."
 (defun message-resend (address)
   "Resend the current article to ADDRESS."
   (interactive
-   (list
-    (let ((mail-abbrev-mode-regexp ""))
-      (read-from-minibuffer
-       "Resend message to: " nil message-mode-map))))
+   (list (message-read-from-minibuffer "Resend message to: ")))
   (message "Resending message to %s..." address)
   (save-excursion
     (let ((cur (current-buffer))
@@ -4193,6 +4190,15 @@ regexp varstr."
        (forward-line 1)
        (insert "Content-Type: text/plain; charset=us-ascii\n")))))
 
+(defun message-read-from-minibuffer (prompt)
+  "Read from the minibuffer while providing abbrev expansion."
+  (if (fboundp 'mail-abbrevs-setup)
+      (let ((mail-abbrev-mode-regexp "")
+           (minibuffer-setup-hook 'mail-abbrevs-setup))
+       (read-from-minibuffer prompt)))
+  (let ((minibuffer-setup-hook 'mail-abbrev-minibuffer-setup-hook))
+    (read-string prompt)))
+
 (provide 'message)
 
 (run-hooks 'message-load-hook)