From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 24 Jan 2009 16:19:56 +0000 (+0000)
Subject: (environment): Function removed.
X-Git-Tag: emacs-pretest-23.0.90~235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=001c62047a9c665b3a4250a33eb7e21a215e3f10;p=emacs.git

(environment): Function removed.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d397d380ab1..9826c56c34b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-01-24  Eli Zaretskii  <eliz@gnu.org>
 
+	* env.el (environment): Function removed.
+
 	* international/mule-cmds.el (set-language-environment-coding-systems): If
 	default-buffer-file-coding-system is nil, set up to have EOLs that
 	are native for the underlying system-type.
diff --git a/lisp/env.el b/lisp/env.el
index 208ca77465c..8d8bebe09ba 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -205,54 +205,6 @@ in the environment list of the selected frame."
       (message "%s" (if value value "Not set")))
     value))
 
-(defun environment (&optional frame)
-  "Return a list of environment variables with their values.
-Each entry in the list is a string of the form NAME=VALUE.
-
-The returned list can not be used to change environment
-variables, only read them.  See `setenv' to do that.
-
-If optional parameter FRAME is non-nil, then it should be a
-frame.  The function returns the environment of that frame.
-
-The list is constructed by concatenating the elements of
-`process-environment' and the 'environment parameter of the
-selected frame, and removing duplicated and empty values.
-
-Non-ASCII characters are encoded according to the initial value of
-`locale-coding-system', i.e. the elements must normally be decoded for use.
-See `setenv' and `getenv'."
-  (let* ((env (append process-environment
-                      ;; (frame-environment frame)
-		      nil))
-	 (scan env)
-	 prev seen)
-    ;; Remove unset variables from the beginning of the list.
-    (while (and env
-		(or (not (stringp (car env)))
-		    (not (string-match "=" (car env)))))
-      (or (member (car env) seen)
-	  (setq seen (cons (car env) seen)))
-      (setq env (cdr env)
-	    scan env))
-    (let (name)
-      (while scan
-	(cond ((or (not (stringp (car scan)))
-		   (not (string-match "=" (car scan))))
-	       ;; Unset variable.
-	       (or (member (car scan) seen)
-		   (setq seen (cons (car scan) seen)))
-	       (setcdr prev (cdr scan)))
-	      ((member (setq name (substring (car scan) 0 (string-match "=" (car scan)))) seen)
-	       ;; Duplicated variable.
-	       (setcdr prev (cdr scan)))
-	      (t
-	       ;; New variable.
-	       (setq seen (cons name seen))))
-	(setq prev scan
-	      scan (cdr scan))))
-    env))
-
 (provide 'env)
 
 ;; arch-tag: b7d6a8f7-bc81-46db-8e39-8d721d4ed0b8