[Emacs-diffs] Changes to emacs/lisp/env.el

[Juanma Barranquero]

Index: emacs/lisp/env.el
diff -c emacs/lisp/env.el:1.26 emacs/lisp/env.el:1.27
*** emacs/lisp/env.el:1.26      Mon Oct 29 04:10:48 2001
--- emacs/lisp/env.el   Tue Feb  4 06:16:21 2003
***************
*** 55,64 ****
  `$FOO' where FOO is an environment variable name means to substitute
  the value of that variable.  The variable name should be terminated
  with a character not a letter, digit or underscore; otherwise, enclose
! the entire variable name in braces.  Use `$$' to insert a single 
  dollar sign."
    (let ((start 0))
!     (while (string-match 
            (rx (or (and "$" (submatch (1+ (in "a-zA-Z0-9_"))))
                    (and "${" (submatch (minimal-match (0+ anything))) "}")
                    "$$"))
--- 55,64 ----
  `$FOO' where FOO is an environment variable name means to substitute
  the value of that variable.  The variable name should be terminated
  with a character not a letter, digit or underscore; otherwise, enclose
! the entire variable name in braces.  Use `$$' to insert a single
  dollar sign."
    (let ((start 0))
!     (while (string-match
            (rx (or (and "$" (submatch (1+ (in "a-zA-Z0-9_"))))
                    (and "${" (submatch (minimal-match (0+ anything))) "}")
                    "$$"))
***************
*** 101,113 ****
         (when value
         (push value setenv-history))
         ;; Here finally we specify the args to give call setenv with.
!        (list var 
             (read-from-minibuffer (format "Set %s to value: " var)
                                   nil nil nil 'setenv-history
                                   value)
!            nil 
             t))))
!   (if unset 
        (setq value nil)
      (if substitute-env-vars
        (setq value (substitute-env-vars value))))
--- 101,113 ----
         (when value
         (push value setenv-history))
         ;; Here finally we specify the args to give call setenv with.
!        (list var
             (read-from-minibuffer (format "Set %s to value: " var)
                                   nil nil nil 'setenv-history
                                   value)
!            nil
             t))))
!   (if unset
        (setq value nil)
      (if substitute-env-vars
        (setq value (substitute-env-vars value))))