changeset 85966:90ed3b3932bf

Change regexp to match dir like 'a...b'
author Vinicius Jose Latorre <viniciusjl@ig.com.br>
date Thu, 08 Nov 2007 17:11:47 +0000
parents ac6bbbd64b2f
children f305dd344ddb
files lisp/ChangeLog lisp/eshell/em-dirs.el
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Nov 08 16:58:07 2007 +0000
+++ b/lisp/ChangeLog	Thu Nov 08 17:11:47 2007 +0000
@@ -1,3 +1,8 @@
+2007-11-08  David Hansen  <david.hansen@gmx.net>
+
+	* eshell/em-dirs.el (eshell-expand-multiple-dots): Change regexp to
+	match dir like "a...b".
+
 2007-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* smerge-mode.el (smerge-refine-subst): Pass "-d" to diff.
--- a/lisp/eshell/em-dirs.el	Thu Nov 08 16:58:07 2007 +0000
+++ b/lisp/eshell/em-dirs.el	Thu Nov 08 17:11:47 2007 +0000
@@ -319,7 +319,7 @@
     (before translate-multiple-dots
 	    (filename &optional directory) activate)
     (setq filename (eshell-expand-multiple-dots filename)))"
-  (while (string-match "\\.\\.\\(\\.+\\)" path)
+  (while (string-match "\\(?:^\\|/\\)\\.\\.\\(\\.+\\)\\(?:$\\|/\\)" path)
     (let* ((extra-dots (match-string 1 path))
 	   (len (length extra-dots))
 	   replace-text)