From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 24 Oct 2001 22:49:12 +0000 (+0000)
Subject: (substitute-env-vars): Quote the arg to rx.
X-Git-Tag: ttn-vms-21-2-B4~19189
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0209a386fbff465d69133ec159bd519be3fc0d78;p=emacs.git

(substitute-env-vars): Quote the arg to rx.
---

diff --git a/lisp/env.el b/lisp/env.el
index e19f9f7f5da..1da48e05ea9 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -59,9 +59,9 @@ 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))) "}")
-		    "$$"))
+	    (rx '(or (and "$" (submatch (1+ (in "a-zA-Z0-9_"))))
+		     (and "${" (submatch (minimal-match (0+ anything))) "}")
+		     "$$"))
 	    string start)
       (cond ((match-beginning 1)
 	     (let ((value (getenv (match-string 1 string))))