Mercurial > emacs
changeset 109414:51f725b66eac
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 22 Jun 2010 00:22:23 +0000 |
| parents | f55bbc59cc75 (current diff) a52944b44517 (diff) |
| children | 5922ae6fb6dc |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jun 21 22:48:16 2010 +0000 +++ b/lisp/ChangeLog Tue Jun 22 00:22:23 2010 +0000 @@ -1,3 +1,9 @@ +2010-06-21 Karl Fogel <kfogel@red-bean.com> + + * simple.el (compose-mail): Fix doc string to refer to + `compose-mail-user-agent-warnings', instead of to the + nonexistent `compose-mail-check-user-agent'. + 2010-06-21 Alan Mackenzie <bug-cc-mode@gnu.org> Fix an indentation bug:
--- a/lisp/simple.el Mon Jun 21 22:48:16 2010 +0000 +++ b/lisp/simple.el Tue Jun 22 00:22:23 2010 +0000 @@ -5698,7 +5698,7 @@ The default mail mode is now Message mode. You have the following Mail mode variable%s customized: \n %s\n\nTo use Mail mode, set `mail-user-agent' to sendmail-user-agent. -To disable this warning, set `compose-mail-check-user-agent' to nil." +To disable this warning, set `compose-mail-user-agent-warnings' to nil." (if (> (length warn-vars) 1) "s" "") (mapconcat 'symbol-name warn-vars " "))))))