summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-10 16:29:19 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-10 16:29:19 +0200
commit3329e6e390caf3443ffa486b3e39dd71cafe3a29 (patch)
tree19d2e5c8e8a7022a8c944fdd9dffe730a941ed41
parent505e364506a87ca26ec77550cbc35b2066ce3b9f (diff)
downloademacs-3329e6e390caf3443ffa486b3e39dd71cafe3a29.tar.gz
(Environment): Mention removing variables
Text suggested by Kevin Rodgers.
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/cmdargs.texi9
2 files changed, 10 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 8a5bccc183c..9993f5f883e 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * cmdargs.texi (Environment): Mention removing variables
+ (bug#1615). Text suggested by Kevin Rodgers.
+
2011-07-10 Chong Yidong <cyd@stupidchicken.com>
* misc.texi (Amusements): Don't mention Yow; it's crippled.
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 1c3b85559d2..af493ade2f2 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -427,10 +427,11 @@ software) inherit the environment from Emacs, too.
@vindex initial-environment
Inside Emacs, the command @kbd{M-x getenv} gets the value of an
environment variable. @kbd{M-x setenv} sets a variable in the Emacs
-environment. (Environment variable substitutions with @samp{$} work
-in the value just as in file names; see @ref{File Names with $}.) The
-variable @code{initial-environment} stores the initial environment
-inherited by Emacs.
+environment, and @kbd{C-u M-x setenv} removes a variable.
+(Environment variable substitutions with @samp{$} work in the value
+just as in file names; see @ref{File Names with $}.) The variable
+@code{initial-environment} stores the initial environment inherited by
+Emacs.
The way to set environment variables outside of Emacs depends on the
operating system, and especially the shell that you are using. For