*** empty log message ***

[gnu-emacs] / lisp / eshell / esh-var.el

diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index 5c74a19c428d04822fb5ac5910d47c40d7191e1c..2bebb6a79ccc3ee00108544dc1cd2c296a8b9822 100644 (file)
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -1,6 +1,9 @@
-;;; esh-var --- handling of variables
+;;; esh-var.el --- handling of variables
 
-;; Copyright (C) 1999, 2000 Free Sofware Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
+
+;; Author: John Wiegley <johnw@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
@@ -16,8 +19,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 (provide 'esh-var)
 
@@ -26,7 +29,7 @@
 (defgroup eshell-var nil
   "Variable interpolation is introduced whenever the '$' character
 appears unquoted in any argument (except when that argument is
-surrounded by single quotes) .  It may be used to interpolate a
+surrounded by single quotes).  It may be used to interpolate a
 variable value, a subcommand, or even the result of a Lisp form."
   :tag "Variable handling"
   :group 'eshell)
@@ -135,6 +138,11 @@ variable value, a subcommand, or even the result of a Lisp form."
   :type 'boolean
   :group 'eshell-var)
 
+(defcustom eshell-modify-global-environment nil
+  "*If non-nil, using `export' changes Emacs's global environment."
+  :type 'boolean
+  :group 'eshell-var)
+
 (defcustom eshell-variable-name-regexp "[A-Za-z0-9_-]+"
   "*A regexp identifying what constitutes a variable name reference.
 Note that this only applies for '$NAME'.  If the syntax '$<NAME>' is
@@ -197,7 +205,9 @@ function), and the arguments passed to this function would be the list
   "Initialize the variable handle code."
   ;; Break the association with our parent's environment.  Otherwise,
   ;; changing a variable will affect all of Emacs.
-  (set (make-local-variable 'process-environment) (eshell-copy-environment))
+  (unless eshell-modify-global-environment
+    (set (make-local-variable 'process-environment)
+        (eshell-copy-environment)))
 
   (define-key eshell-command-map [(meta ?v)] 'eshell-insert-envvar)
 
@@ -206,15 +216,12 @@ function), and the arguments passed to this function would be the list
   (set (make-local-variable 'eshell-special-chars-outside-quoting)
        (append eshell-special-chars-outside-quoting '(?$)))
 
-  (make-local-hook 'eshell-parse-argument-hook)
   (add-hook 'eshell-parse-argument-hook 'eshell-interpolate-variable t t)
 
-  (make-local-hook 'eshell-prepare-command-hook)
   (add-hook 'eshell-prepare-command-hook
            'eshell-handle-local-variables nil t)
 
   (when (eshell-using-module 'eshell-cmpl)
-    (make-local-hook 'pcomplete-try-first-hook)
     (add-hook 'pcomplete-try-first-hook
              'eshell-complete-variable-reference nil t)
     (add-hook 'pcomplete-try-first-hook
@@ -264,13 +271,13 @@ function), and the arguments passed to this function would be the list
   "Parse a variable interpolation.
 This function is explicit for adding to `eshell-parse-argument-hook'."
   (when (and (eq (char-after) ?$)
-            (not (= (1+ (point)) (point-max))))
+            (/= (1+ (point)) (point-max)))
     (forward-char)
     (list 'eshell-escape-arg
          (eshell-parse-variable))))
 
 (defun eshell/define (var-alias definition)
-  "Define an VAR-ALIAS using DEFINITION."
+  "Define a VAR-ALIAS using DEFINITION."
   (if (not definition)
       (setq eshell-variable-aliases-list
            (delq (assoc var-alias eshell-variable-aliases-list)
@@ -291,9 +298,10 @@ This function is explicit for adding to `eshell-parse-argument-hook'."
   nil)
 
 (defun eshell/export (&rest sets)
-  "This alias allows the 'export' command to act as bash users expect."
+  "This alias allows the `export' command to act as bash users expect."
   (while sets
-    (if (string-match "^\\([^=]+\\)=\\(.*\\)" (car sets))
+    (if (and (stringp (car sets))
+            (string-match "^\\([^=]+\\)=\\(.*\\)" (car sets)))
        (setenv (match-string 1 (car sets))
                (match-string 2 (car sets))))
     (setq sets (cdr sets))))
@@ -305,6 +313,17 @@ This function is explicit for adding to `eshell-parse-argument-hook'."
              process-environment
            (eshell-envvar-names)))))
 
+(defun eshell/unset (&rest args)
+  "Unset an environment variable."
+  (while args
+    (if (stringp (car args))
+       (setenv (car args) nil t))
+    (setq args (cdr args))))
+
+(defun pcomplete/eshell-mode/unset ()
+  "Completion function for Eshell's `unset'."
+  (while (pcomplete-here (eshell-envvar-names))))
+
 (defun eshell/setq (&rest args)
   "Allow command-ish use of `setq'."
   (let (last-value)
@@ -412,11 +431,11 @@ Possible options are:
                    (eshell-parse-double-quote))))
        (if name
          (list 'eshell-get-variable (eval name) 'indices))))
-     ((eq (char-after) ?<)
+     ((eq (char-after) ?\<)
       (let ((end (eshell-find-delimiter ?\< ?\>)))
        (if (not end)
            (throw 'eshell-incomplete ?\<)
-         (let* ((temp (make-temp-name temporary-file-directory))
+         (let* ((temp (make-temp-file temporary-file-directory))
                 (cmd (concat (buffer-substring (1+ (point)) end)
                              " > " temp)))
            (prog1
@@ -550,7 +569,7 @@ For example, to retrieve the second element of a user's record in
                        (split-string value separator)))))
       (cond
        ((< (length refs) 0)
-       (error "Illegal array variable index: %s"
+       (error "Invalid array variable index: %s"
               (eshell-stringify refs)))
        ((= (length refs) 1)
        (setq value (eshell-index-value value (car refs))))
@@ -613,7 +632,7 @@ For example, to retrieve the second element of a user's record in
            (if (and value
                     (stringp value)
                     (file-directory-p value))
-               (concat varname (char-to-string directory-sep-char))
+               (concat varname "/")
              varname))))
        (eshell-envvar-names (eshell-environment-variables)))
       (all-completions argname obarray 'boundp)
@@ -632,4 +651,5 @@ For example, to retrieve the second element of a user's record in
 
 ;;; Code:
 
+;;; arch-tag: 393654fe-bdad-4f27-9a10-b1472ded14cf
 ;;; esh-var.el ends here