aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2009-01-24 16:24:17 +0000
committerEli Zaretskii2009-01-24 16:24:17 +0000
commit3533155bcfa51cb327aac56af2b6ffaa6a9a20e5 (patch)
treef1e451d750884fa81fbd910ca50612995293f139
parent001c62047a9c665b3a4250a33eb7e21a215e3f10 (diff)
downloademacs-3533155bcfa51cb327aac56af2b6ffaa6a9a20e5.tar.gz
emacs-3533155bcfa51cb327aac56af2b6ffaa6a9a20e5.zip
(System Environment): Remove description of the `environment' function which
has been deleted.
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/os.texi10
-rw-r--r--etc/NEWS3
3 files changed, 5 insertions, 13 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 964377b8e7b..bfe41f9bd0c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12009-01-24 Eli Zaretskii <eliz@gnu.org>
2
3 * os.texi (System Environment): Remove description of the
4 `environment' function which has been deleted.
5
12009-01-22 Dan Nicolaescu <dann@ics.uci.edu> 62009-01-22 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * frames.texi (Multiple Displays): Remove documentation for 8 * frames.texi (Multiple Displays): Remove documentation for
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 010ccc597b7..ddca40dc5d9 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -876,16 +876,6 @@ specify the same environment variable, the first of these elements
876specifies the variable, and the other ``duplicates'' are ignored. 876specifies the variable, and the other ``duplicates'' are ignored.
877@end defvar 877@end defvar
878 878
879@defun environment &optional frame
880This is a convenience function that returns the value of
881@code{process-environment} after removing unset and duplicate
882variables from it. The optional argument @var{frame}, which should be
883a frame, means return the list of environment variables in effect for
884that frame. The value this function returns is a copy, so changing it
885will have no effect on the environment variables passed to
886subprocesses.
887@end defun
888
889@defvar initial-environment 879@defvar initial-environment
890This variable holds the list of environment variables Emacs inherited 880This variable holds the list of environment variables Emacs inherited
891from its parent process. It is computed during startup, see 881from its parent process. It is computed during startup, see
diff --git a/etc/NEWS b/etc/NEWS
index 9e0d0c51044..86adf822b50 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1729,9 +1729,6 @@ deleting a terminal.
1729*** New functions: 1729*** New functions:
1730 1730
1731+++ 1731+++
1732**** `environment'
1733
1734+++
1735**** `delete-terminal' 1732**** `delete-terminal'
1736 1733
1737+++ 1734+++