Backport from trunk: doc fix.

* lisp/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'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c14f7326cf67e1a3590dfafd8db41f1c59945471..64bce4a24a495cb12292951d35f4023c2af963f6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-23  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-22  Dan Nicolaescu  <dann@ics.uci.edu>
 
        Fix vc-annotate for renamed files when using Git.

diff --git a/lisp/simple.el b/lisp/simple.el
index 35001a694dff84a6ca9f6ff1e50b7985298ca5d6..51b33ad4fc614bbc20a2599bbcfb65672a37d810 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5669,7 +5669,7 @@ Each action has the form (FUNCTION . ARGS)."
 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 " "))))))