diff options
| author | John Wiegley | 2001-05-10 03:29:06 +0000 |
|---|---|---|
| committer | John Wiegley | 2001-05-10 03:29:06 +0000 |
| commit | b2c102f30bac02db430e0d7e44eb9084adf40c98 (patch) | |
| tree | d75d08c1e38f3e165ba203953dffa85f8997b3bf | |
| parent | 734f7362aa1f298694b1a7d54d1be8008b1f7d24 (diff) | |
| download | emacs-b2c102f30bac02db430e0d7e44eb9084adf40c98.tar.gz emacs-b2c102f30bac02db430e0d7e44eb9084adf40c98.zip | |
(eshell-shuffle-files): Apply `directory-file-name' before calling
`file-name-directory'.
| -rw-r--r-- | lisp/eshell/em-unix.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index 1dfec1e7021..9b63accbbf0 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el | |||
| @@ -360,10 +360,12 @@ Remove the DIRECTORY(ies), if they are empty.") | |||
| 360 | (eq func 'rename-file) | 360 | (eq func 'rename-file) |
| 361 | (= (nth 11 (eshell-file-attributes | 361 | (= (nth 11 (eshell-file-attributes |
| 362 | (file-name-directory | 362 | (file-name-directory |
| 363 | (expand-file-name source)))) | 363 | (directory-file-name |
| 364 | (expand-file-name source))))) | ||
| 364 | (nth 11 (eshell-file-attributes | 365 | (nth 11 (eshell-file-attributes |
| 365 | (file-name-directory | 366 | (file-name-directory |
| 366 | (expand-file-name target)))))) | 367 | (directory-file-name |
| 368 | (expand-file-name target))))))) | ||
| 367 | (apply 'eshell-funcalln func source target args) | 369 | (apply 'eshell-funcalln func source target args) |
| 368 | (unless (file-directory-p target) | 370 | (unless (file-directory-p target) |
| 369 | (if verbose | 371 | (if verbose |