# HG changeset patch # User Glenn Morris # Date 1277262440 25200 # Node ID 9df40307a957a11022716709b5f31f3b38fb8248 # Parent 21cb91dca6c72986e57151d650160e9a58a0d8c9 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 -r 21cb91dca6c7 -r 9df40307a957 lisp/ChangeLog --- a/lisp/ChangeLog Tue Jun 22 20:01:35 2010 -0700 +++ b/lisp/ChangeLog Tue Jun 22 20:07:20 2010 -0700 @@ -1,3 +1,9 @@ +2010-06-23 Karl Fogel + + * 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 Fix vc-annotate for renamed files when using Git. diff -r 21cb91dca6c7 -r 9df40307a957 lisp/simple.el --- a/lisp/simple.el Tue Jun 22 20:01:35 2010 -0700 +++ b/lisp/simple.el Tue Jun 22 20:07:20 2010 -0700 @@ -5669,7 +5669,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 " "))))))