Update ChangeLog for 2013-03-11T17:17:13Z!tzz@lifelogs.com.

[bpt/emacs.git] / lisp / env.el

diff --git a/lisp/env.el b/lisp/env.el
index f770dd2..5618404 100644 (file)
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -1,6 +1,6 @@
 ;;; env.el --- functions to manipulate environment variables
 
-;; Copyright (C) 1991, 1994, 2000-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1994, 2000-2013 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: processes, unix
@@ -58,10 +58,7 @@ If it is also not t, RET does not exit if it does non-null completion."
 (defvar setenv-history nil)
 
 (defconst env--substitute-vars-regexp
-  (rx "$"
-      (or (submatch-n 1 (1+ (regexp "[[:alnum:]_]")))
-          (and "{" (submatch-n 1 (minimal-match (0+ anything))) "}")
-          "$")))
+  "\\$\\(?:\\(?1:[[:alnum:]_]+\\)\\|{\\(?1:[^{}]+\\)}\\|\\$\\)")
 
 (defun substitute-env-vars (string &optional only-defined)
   "Substitute environment variables referred to in STRING.