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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee381421a7d9bc47bb01f47798547101bc7465f4..30b0241e8fd52005bb2be34871aa4a6de30aa9da 100644 (file)
--- 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-07  Johan Bockg\e,Ae\e(Brd  <bojohan@gnu.org>
 
        * eshell/esh-mode.el (eshell-output-filter):

diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 0000cae5adf89195c8dbd7f5c89f08053fef6fac..02556661b1b5a15a04045432d308d716b861cbfa 100644 (file)
--- 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)