aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Fogel2010-06-22 20:07:20 -0700
committerGlenn Morris2010-06-22 20:07:20 -0700
commit2c79f0537836a6c3cde8e5f55dd95d893cb4cb0b (patch)
treeba1dab807c296367390304241962347bcbcfc7e5
parentb11867f9566cac56911529be2ef3162b54ce892f (diff)
downloademacs-2c79f0537836a6c3cde8e5f55dd95d893cb4cb0b.tar.gz
emacs-2c79f0537836a6c3cde8e5f55dd95d893cb4cb0b.zip
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'.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/simple.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c14f7326cf6..64bce4a24a4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12010-06-23 Karl Fogel <kfogel@red-bean.com>
2
3 * simple.el (compose-mail): Fix doc string to refer to
4 `compose-mail-user-agent-warnings', instead of to the
5 nonexistent `compose-mail-check-user-agent'.
6
12010-06-22 Dan Nicolaescu <dann@ics.uci.edu> 72010-06-22 Dan Nicolaescu <dann@ics.uci.edu>
2 8
3 Fix vc-annotate for renamed files when using Git. 9 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)."
5669The default mail mode is now Message mode. 5669The default mail mode is now Message mode.
5670You have the following Mail mode variable%s customized: 5670You have the following Mail mode variable%s customized:
5671\n %s\n\nTo use Mail mode, set `mail-user-agent' to sendmail-user-agent. 5671\n %s\n\nTo use Mail mode, set `mail-user-agent' to sendmail-user-agent.
5672To disable this warning, set `compose-mail-check-user-agent' to nil." 5672To disable this warning, set `compose-mail-user-agent-warnings' to nil."
5673 (if (> (length warn-vars) 1) "s" "") 5673 (if (> (length warn-vars) 1) "s" "")
5674 (mapconcat 'symbol-name 5674 (mapconcat 'symbol-name
5675 warn-vars " ")))))) 5675 warn-vars " "))))))