# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1277166143 0
# Node ID 51f725b66eac23f59ad558901dc4c9d1ab1aaace
# Parent  f55bbc59cc752bc398944dd32110202b6cd00c1a# Parent  a52944b445179bee5ab0cf174a05ab79fbd87faa
Merge from mainline.

diff -r f55bbc59cc75 -r 51f725b66eac lisp/ChangeLog
--- 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:
diff -r f55bbc59cc75 -r 51f725b66eac lisp/simple.el
--- 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 " "))))))