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

[Richard M. Stallman]

Index: emacs/lisp/env.el
diff -c emacs/lisp/env.el:1.30 emacs/lisp/env.el:1.31
*** emacs/lisp/env.el:1.30      Tue May  6 13:54:41 2003
--- emacs/lisp/env.el   Wed May 28 07:16:22 2003
***************
*** 63,74 ****
  `$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
            (eval-when-compile
!             (rx (or (and "$" (submatch (1+ (regexp "[:alnum:]_"))))
                      (and "${" (submatch (minimal-match (0+ anything))) "}")
                      "$$")))
            string start)
--- 63,76 ----
  `$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.  For instance, in `ab$cd-x',
! `$cd' is treated as an environment variable.
! 
! Use `$$' to insert a single dollar sign."
    (let ((start 0))
      (while (string-match
            (eval-when-compile
!             (rx (or (and "$" (submatch (1+ (regexp "[[:alnum:]_]"))))
                      (and "${" (submatch (minimal-match (0+ anything))) "}")
                      "$$")))
            string start)