* tramp.texi (top) [xxx, yyy, trampfn]: Provide two versions of

[gnu-emacs] / lisp / env.el

diff --git a/lisp/env.el b/lisp/env.el
index 06ee533d74c092f84140ecd5135beb52304162bd..9e3aed95f8a4aa8699ab2e3b791077eba43677f6 100644 (file)
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -1,10 +1,10 @@
 ;;; env.el --- functions to manipulate environment variables
 
-;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1994, 2000-2013 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: processes, unix
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -34,8 +34,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
-
 ;; History list for environment variable names.
 (defvar read-envvar-name-history nil)
 
@@ -198,62 +196,15 @@ in the environment list of the selected frame."
                                    (encode-coding-string
                                     variable locale-coding-system)
                                  variable)
-                               frame)))
+                               (and frame
+                                    (assq 'environment
+                                          (frame-parameters frame))))))
     (if (and enable-multibyte-characters value)
        (setq value (decode-coding-string value locale-coding-system)))
-    (when (interactive-p)
+    (when (called-interactively-p 'interactive)
       (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
 ;;; env.el ends here