From: Karl Fogel Date: Wed, 23 Jun 2010 03:07:20 +0000 (-0700) Subject: Backport from trunk: doc fix. X-Git-Tag: emacs-pretest-23.2.90~139^2~96 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c79f0537836a6c3cde8e5f55dd95d893cb4cb0b;p=emacs.git 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 c14f7326cf6..64bce4a24a4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/simple.el b/lisp/simple.el index 35001a694df..51b33ad4fc6 100644 --- 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 " "))))))