Mercurial > emacs
comparison lisp/eshell/em-dirs.el @ 91085:880960b70474
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 11 Nov 2007 00:56:44 +0000 |
| parents | f55f9811f5d7 e0ca14d507a5 |
| children | 53108e6cea98 |
comparison
equal
deleted
inserted
replaced
| 91084:a4347a111894 | 91085:880960b70474 |
|---|---|
| 317 | 317 |
| 318 (defadvice expand-file-name | 318 (defadvice expand-file-name |
| 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) |
| 326 (while (> len 0) | 326 (while (> len 0) |
| 327 (setq replace-text (concat replace-text "/..") | 327 (setq replace-text (concat replace-text "/..") |