From: Vinicius Jose Latorre <viniciusjl@ig.com.br>
Date: Thu, 8 Nov 2007 17:12:37 +0000 (+0000)
Subject: Change regexp to match dir like 'a...b'
X-Git-Tag: emacs-pretest-23.0.90~9835
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=661192e6b710612104ec3716a83743962328f627;p=emacs.git

Change regexp to match dir like 'a...b'
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d78f776bc19..b1c520e6d97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-08  David Hansen  <david.hansen@gmx.net>  (tiny change)
+
+	* 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.
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 0000cae5adf..02556661b1b 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -319,7 +319,7 @@ in the minibuffer:
     (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)