*** 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 3578b5d1ef676c6de31c7af3a2359bd58cd33ef0..2bebb6a79ccc3ee00108544dc1cd2c296a8b9822 100644 (file)
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -1,6 +1,7 @@
 ;;; esh-var.el --- handling of variables
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -18,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)
 
@@ -28,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)
@@ -297,7 +298,7 @@ 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 (and (stringp (car sets))
             (string-match "^\\([^=]+\\)=\\(.*\\)" (car sets)))
@@ -430,7 +431,7 @@ 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 ?\<)
@@ -568,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))))
@@ -631,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)