[Emacs-diffs] /srv/bzr/emacs/trunk r102656: Make build-mail-aliases an interactive command.

[Glenn Morris]

------------------------------------------------------------
revno: 102656
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2010-12-13 20:42:59 -0800
message:
  Make build-mail-aliases an interactive command.
  
  * lisp/mail/mailalias.el (build-mail-aliases): Make it interactive.
  * lisp/mail/sendmail.el (build-mail-aliases): Update autoload.
  
  * doc/misc/faq.texi (Expanding aliases when sending mail):
  Now build-mail-aliases is interactive.
modified:
  doc/misc/ChangeLog
  doc/misc/faq.texi
  lisp/ChangeLog
  lisp/mail/mailalias.el
  lisp/mail/sendmail.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-12-13 23:54:31 +0000
+++ b/doc/misc/ChangeLog        2010-12-14 04:42:59 +0000
@@ -1,12 +1,17 @@
+2010-12-14  Glenn Morris  <address@hidden>
+
+       * faq.texi (Expanding aliases when sending mail):
+       Now build-mail-aliases is interactive.
+
 2010-12-13  Andrew Cohen  <address@hidden>
 
        * gnus.texi: First pass at adding (rough) nnir documentation.
 
 2010-12-13  Lars Magne Ingebrigtsen  <address@hidden>
 
-       * gnus.texi (Filtering New Groups): Mention
-       gnus-auto-subscribed-categories.
-       (The First Time): Removed, since default-subscribed-newsgroups has been
+       * gnus.texi (Filtering New Groups):
+       Mention gnus-auto-subscribed-categories.
+       (The First Time): Remove, since default-subscribed-newsgroups has been
        removed.
 
 2010-12-13  Glenn Morris  <address@hidden>

=== modified file 'doc/misc/faq.texi'
--- a/doc/misc/faq.texi 2010-12-13 15:27:36 +0000
+++ b/doc/misc/faq.texi 2010-12-14 04:42:59 +0000
@@ -4299,12 +4299,12 @@
 Normally, Emacs expands aliases when you send the message.
 To expand them before this, use @kbd{M-x expand-mail-aliases}.
 
address@hidden FIXME there should be an interactive rebuild command for this.
 @item
-Emacs normally only reads the @file{.mailrc} file once per session,
-when you start to compose your first mail message.  If you edit
address@hidden, you can type @kbd{M-: (build-mail-aliases) @key{RET}} to
-make Emacs reread @file{~/.mailrc}.
+Emacs normally only reads the @file{.mailrc} file once per session, when
+you start to compose your first mail message.  If you edit the file
+after this, you can use @kbd{M-x build-mail-aliases} to make Emacs
+reread it.  Prior to Emacs 24.1, this is not an interactive command, so
+you must instead type @kbd{M-: (build-mail-aliases) @key{RET}}.
 
 @item
 If you like, you can expand mail aliases as abbrevs, as soon as you

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-14 04:35:33 +0000
+++ b/lisp/ChangeLog    2010-12-14 04:42:59 +0000
@@ -1,5 +1,8 @@
 2010-12-14  Glenn Morris  <address@hidden>
 
+       * mail/mailalias.el (build-mail-aliases): Make it interactive.
+       * mail/sendmail.el (build-mail-aliases): Update autoload.
+
        * dired.el (dired-trivial-filenames, dired-chown-program)
        (dired-auto-revert-buffer): Remove autoload cookies.
        * mail/sendmail.el (mail-recover-1): Require 'dired.

=== modified file 'lisp/mail/mailalias.el'
--- a/lisp/mail/mailalias.el    2010-01-13 08:35:10 +0000
+++ b/lisp/mail/mailalias.el    2010-12-14 04:42:59 +0000
@@ -1,7 +1,8 @@
 ;;; mailalias.el --- expand and complete mailing address aliases
 
-;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
@@ -240,6 +241,11 @@
 (defun build-mail-aliases (&optional file)
   "Read mail aliases from personal aliases file and set `mail-aliases'.
 By default, this is the file specified by `mail-personal-alias-file'."
+  (interactive
+   (list
+    (read-file-name (format "Read mail alias file (default %s): "
+                           mail-personal-alias-file)
+                   nil mail-personal-alias-file t)))
   (setq file (expand-file-name (or file mail-personal-alias-file)))
   ;; In case mail-aliases is t, make sure define-mail-alias
   ;; does not recursively call build-mail-aliases.
@@ -562,5 +568,4 @@
 
 (provide 'mailalias)
 
-;; arch-tag: 1d6a0f87-eb34-4d45-8816-60c1b952cf46
 ;;; mailalias.el ends here

=== modified file 'lisp/mail/sendmail.el'
--- a/lisp/mail/sendmail.el     2010-12-14 04:35:33 +0000
+++ b/lisp/mail/sendmail.el     2010-12-14 04:42:59 +0000
@@ -384,7 +384,7 @@
 
 (autoload 'build-mail-aliases "mailalias"
   "Read mail aliases from personal aliases file and set `mail-aliases'.
-By default, this is the file specified by `mail-personal-alias-file'.")
+By default, this is the file specified by `mail-personal-alias-file'." t)
 
 ;;;###autoload
 (defcustom mail-signature t