changeset 39714:e6ba84d67359

(rfn-eshadow-regexp): Deal correctly with escaped dollar-signs.
author Miles Bader <miles@gnu.org>
date Tue, 09 Oct 2001 02:52:56 +0000
parents 25d48943cd58
children 1fd1506f8383
files lisp/rfn-eshadow.el
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/rfn-eshadow.el	Tue Oct 09 02:26:00 2001 +0000
+++ b/lisp/rfn-eshadow.el	Tue Oct 09 02:52:56 2001 +0000
@@ -129,10 +129,10 @@
 	 ;; This horrible regexp considers the following patterns as
 	 ;; starting an absolute pathname, when following a `/' or an `\':
 	 ;;   L:  /  //  ~  $  \\  \\\\
-	 "\\(.*[^/]+/+?\\|/*?\\|\\)\\([$~]\\|[][\\^a-z]:\\|//?\\([^][\\^a-z/$~]\\|[^/$~][^:]\\|[^/$~]?\\'\\)\\)")
+	 "\\(.*[^/]+/+?\\|/*?\\|\\)\\(~\\|$[^$]\\|$\\'\\|[][\\^a-z]:\\|//?\\([^][\\^a-z/$~]\\|[^/$~][^:]\\|[^/$~]?\\'\\)\\)")
 	(t
 	 ;; default is for unix-style filenames
-	 "\\(.*/\\)[/$~]"))
+	 "\\(.*/\\)\\([/~]\\|$[^$]\\|$\\'\\)"))
   "Regular expression used to match shadowed filenames.
 There should be at least one regexp group; the end of the first one
 is used as the end of the shadowed portion of the filename.")