;;; env.el --- functions to manipulate environment variables
;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: processes, unix
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
If it is also not t, RET does not exit if it does non-null completion."
(completing-read prompt
(mapcar (lambda (enventry)
- (list (if enable-multibyte-characters
- (decode-coding-string
- (substring enventry 0
- (string-match "=" enventry))
- locale-coding-system t)
- (substring enventry 0
- (string-match "=" enventry)))))
+ (let ((str (substring enventry 0
+ (string-match "=" enventry))))
+ (if (multibyte-string-p str)
+ (decode-coding-string
+ str locale-coding-system t)
+ str)))
(append process-environment
- nil ;;(frame-parameter (frame-with-environment) 'environment)
+ ;;(frame-environment)
))
nil mustmatch nil 'read-envvar-name-history))
;; Fixme: Should the environment be recoded if LC_CTYPE &c is set?
-(defun setenv (variable &optional value substitute-env-vars frame)
+(defun setenv (variable &optional value substitute-env-vars)
"Set the value of the environment variable named VARIABLE to VALUE.
VARIABLE should be a string. VALUE is optional; if not provided or
nil, the environment variable VARIABLE will be removed.
variables in VALUE with `substitute-env-vars', which see.
This is normally used only for interactive calls.
-If optional parameter FRAME is non-nil, this function modifies
-only the frame-local value of VARIABLE on FRAME, ignoring
-`process-environment'. Note that frames on the same terminal
-device usually share their environment, so calling `setenv' on
-one of them affects the others as well.
-
-If FRAME is nil, `setenv' changes the global value of VARIABLE by
-modifying `process-environment'. Note that the global value
-overrides any frame-local values.
-
The return value is the new value of VARIABLE, or nil if
it was removed from the environment.
+This function works by modifying `process-environment'.
+
As a special case, setting variable `TZ' calls `set-time-zone-rule' as
a side-effect."
(interactive
(error "Environment variable name `%s' contains `='" variable))
(if (string-equal "TZ" variable)
(set-time-zone-rule value))
- (if (null frame)
- (setq process-environment (setenv-internal process-environment
- variable value t))
- (setq frame (frame-with-environment frame))
- (cond
- ((string-equal "TERM" variable)
- (set-frame-parameter frame 'term-environment-variable value))
- ((string-equal "DISPLAY" variable)
- (set-frame-parameter frame 'display-environment-variable value))
- (t
- (setq process-environment (setenv-internal process-environment
- variable value nil)))))
+ (setq process-environment (setenv-internal process-environment
+ variable value t))
value)
(defun getenv (variable &optional 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-parameter (frame-with-environment frame)
-;; 'environment)
- 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))
-
-(defmacro let-environment (varlist &rest body)
- "Evaluate BODY with environment variables set according to VARLIST.
-The environment variables are then restored to their previous
-values.
-The value of the last form in BODY is returned.
-
-Each element of VARLIST is either a string (which variable is
-then removed from the environment), or a list (NAME
-VALUEFORM) (which sets NAME to the value of VALUEFORM, a string).
-All the VALUEFORMs are evaluated before any variables are set."
- (declare (indent 2))
- (let ((old-env (make-symbol "old-env"))
- (name (make-symbol "name"))
- (value (make-symbol "value"))
- (entry (make-symbol "entry"))
- (frame (make-symbol "frame")))
- `(let ((,frame (selected-frame))
- ,old-env)
- ;; Evaluate VALUEFORMs and replace them in VARLIST with their values.
- (dolist (,entry ,varlist)
- (unless (stringp ,entry)
- (if (cdr (cdr ,entry))
- (error "`let-environment' bindings can have only one value-form"))
- (setcdr ,entry (eval (cadr ,entry)))))
- ;; Set the variables.
- (dolist (,entry ,varlist)
- (let ((,name (if (stringp ,entry) ,entry (car ,entry)))
- (,value (if (consp ,entry) (cdr ,entry))))
- (setq ,old-env (cons (cons ,name (getenv ,name)) ,old-env))
- (setenv ,name ,value)))
- (unwind-protect
- (progn ,@body)
- ;; Restore old values.
- (with-selected-frame (if (frame-live-p ,frame)
- ,frame
- (selected-frame))
- (dolist (,entry ,old-env)
- (setenv (car ,entry) (cdr ,entry))))))))
-
(provide 'env)
-;;; arch-tag: b7d6a8f7-bc81-46db-8e39-8d721d4ed0b8
+;; arch-tag: b7d6a8f7-bc81-46db-8e39-8d721d4ed0b8
;;; env.el ends here
HCoop / bpt / emacs.git / blobdiff