aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinicius Jose Latorre2007-11-08 17:14:46 +0000
committerVinicius Jose Latorre2007-11-08 17:14:46 +0000
commitf71ee9c1b32f5145829aa0d3eb5c6a302734c2cd (patch)
tree1e41c8bd465c5e4b0a21195d6fb0dc11f22b08df
parent76a05775d83f87c9ce17a2f16883b04e253c41ea (diff)
downloademacs-f71ee9c1b32f5145829aa0d3eb5c6a302734c2cd.tar.gz
emacs-f71ee9c1b32f5145829aa0d3eb5c6a302734c2cd.zip
Change regexp to match dir like 'a...b'
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/eshell/em-dirs.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee381421a7d..30b0241e8fd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-11-08 David Hansen <david.hansen@gmx.net> (tiny change)
2
3 * eshell/em-dirs.el (eshell-expand-multiple-dots): Change regexp to
4 match dir like "a...b".
5
12007-11-07 Johan Bockg,Ae(Brd <bojohan@gnu.org> 62007-11-07 Johan Bockg,Ae(Brd <bojohan@gnu.org>
2 7
3 * eshell/esh-mode.el (eshell-output-filter): 8 * eshell/esh-mode.el (eshell-output-filter):
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:
319 (before translate-multiple-dots 319 (before translate-multiple-dots
320 (filename &optional directory) activate) 320 (filename &optional directory) activate)
321 (setq filename (eshell-expand-multiple-dots filename)))" 321 (setq filename (eshell-expand-multiple-dots filename)))"
322 (while (string-match "\\.\\.\\(\\.+\\)" path) 322 (while (string-match "\\(?:^\\|/\\)\\.\\.\\(\\.+\\)\\(?:$\\|/\\)" path)
323 (let* ((extra-dots (match-string 1 path)) 323 (let* ((extra-dots (match-string 1 path))
324 (len (length extra-dots)) 324 (len (length extra-dots))
325 replace-text) 325 replace-text)