diff options
Diffstat (limited to 'lisp/eshell/em-dirs.el')
| -rw-r--r-- | lisp/eshell/em-dirs.el | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index 7b74069454b..6477a546eb8 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -276,8 +276,7 @@ Thus, this does not include the current directory.") (let* ((letter (match-string 1)) (regexp (concat "\\`" letter)) (path (eshell-find-previous-directory regexp))) - (concat (or path letter) - (char-to-string directory-sep-char))))) + (concat (or path letter) "/")))) (defun eshell-complete-user-reference () "If there is a user reference, complete it." @@ -300,7 +299,7 @@ Thus, this does not include the current directory.") (let* ((path default-directory) (len (length path))) (if (and (> len 1) - (eq (aref path (1- len)) directory-sep-char) + (eq (aref path (1- len)) ?/) (not (and (eshell-under-windows-p) (string-match "\\`[A-Za-z]:[\\\\/]\\'" path)))) (setq path (substring path 0 (1- (length path))))) @@ -324,9 +323,7 @@ in the minibuffer: (len (length extra-dots)) replace-text) (while (> len 0) - (setq replace-text - (concat replace-text - (char-to-string directory-sep-char) "..") + (setq replace-text (concat replace-text "/..") len (1- len))) (setq path (replace-match replace-text t t path 1)))) @@ -371,7 +368,7 @@ in the minibuffer: (setq path (ring-remove eshell-last-dir-ring (if index - (string-to-int index) + (string-to-number index) 0))))) ((and path (string-match "^=\\(.*\\)$" path)) (let ((oldpath (eshell-find-previous-directory |