summaryrefslogtreecommitdiff
path: root/lisp/eshell/em-dirs.el
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2005-05-31 00:14:26 +0000
committerJohn Wiegley <johnw@newartisans.com>2005-05-31 00:14:26 +0000
commit6b0e3e4df5deff8b5d1dcb5065c070abb8393e9d (patch)
treec20c50525936f9970338856e57bac951c4b3696e /lisp/eshell/em-dirs.el
parentc7a4ce37e95f0ac17d80bdb7c2b1280b82b186fb (diff)
downloademacs-6b0e3e4df5deff8b5d1dcb5065c070abb8393e9d.tar.gz
Changed all uses of `directory-sep-char' to ?/, and all uses of
`string-to-int' to `string-to-number'.
Diffstat (limited to 'lisp/eshell/em-dirs.el')
-rw-r--r--lisp/eshell/em-dirs.el11
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