mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(eshell-shuffle-files, eshell-shuffle-files):

Browse source 
Use `equal', not `=', since the device number can be a cons cell.
This commit is contained in:
Eli Zaretskii 2001-09-14 16:45:57 +00:00
parent 551629f912
commit c3ea2deb1f
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lisp/eshell/em-unix.el
View file

@ -342,9 +342,11 @@ Remove the DIRECTORY(ies), if they are empty.")
(eq system-type 'ms-dos))
(setq attr (eshell-file-attributes (car files)))
(nth 10 attr-target) (nth 10 attr)
;; Use equal, not -, since the inode and the device could
;; cons cells.
(equal (nth 10 attr-target) (nth 10 attr))
(nth 11 attr-target) (nth 11 attr)
(= (nth 11 attr-target) (nth 11 attr)))
(equal (nth 11 attr-target) (nth 11 attr)))
(eshell-error (format "%s: `%s' and `%s' are the same file\n"
command (car files) target)))
(t
@ -366,14 +368,16 @@ Remove the DIRECTORY(ies), if they are empty.")
(let (eshell-warn-dot-directories)
(if (and (not deep)
(eq func 'rename-file)
(= (nth 11 (eshell-file-attributes
(file-name-directory
(directory-file-name
(expand-file-name source)))))
(nth 11 (eshell-file-attributes
(file-name-directory
(directory-file-name
(expand-file-name target)))))))
;; Use equal, since the device might be a
;; cons cell.
(equal (nth 11 (eshell-file-attributes
(file-name-directory
(directory-file-name
(expand-file-name source)))))
(nth 11 (eshell-file-attributes
(file-name-directory
(directory-file-name
(expand-file-name target)))))))
(apply 'eshell-funcalln func source target args)
(unless (file-directory-p target)
(if verbose