aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-09-10 20:40:42 +0000
committerEli Zaretskii2001-09-10 20:40:42 +0000
commit1f9581b61c03d5a763dcd8cca22363a7dca81bc9 (patch)
tree0c5daa6de925e3bdfb65347dc3ef77b1c32cc727
parent65ee3bf5bf8e09ca36f8a72149f7027d1afa6595 (diff)
downloademacs-1f9581b61c03d5a763dcd8cca22363a7dca81bc9.tar.gz
emacs-1f9581b61c03d5a763dcd8cca22363a7dca81bc9.zip
(eshell-shuffle-files): Compare inodes with
`equal' instead of `=', since they can be cons cells. From Nils Goesche <cartan@cartan.de>.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/eshell/em-unix.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9862cfb0eae..3bfca9f688e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12001-09-10 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * eshell/em-unix.el (eshell-shuffle-files): Compare inodes with
4 `equal' instead of `=', since they can be cons cells. From Nils
5 Goesche <cartan@cartan.de>.
6
12001-09-10 Andre Spiegel <spiegel@gnu.org> 72001-09-10 Andre Spiegel <spiegel@gnu.org>
2 8
3 * vc.el (vc-annotate): Rewrote doc string. 9 * vc.el (vc-annotate): Rewrote doc string.
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 6db127a45f4..985191080a1 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -342,7 +342,7 @@ Remove the DIRECTORY(ies), if they are empty.")
342 (eq system-type 'ms-dos)) 342 (eq system-type 'ms-dos))
343 (setq attr (eshell-file-attributes (car files))) 343 (setq attr (eshell-file-attributes (car files)))
344 (nth 10 attr-target) (nth 10 attr) 344 (nth 10 attr-target) (nth 10 attr)
345 (= (nth 10 attr-target) (nth 10 attr)) 345 (equal (nth 10 attr-target) (nth 10 attr))
346 (nth 11 attr-target) (nth 11 attr) 346 (nth 11 attr-target) (nth 11 attr)
347 (= (nth 11 attr-target) (nth 11 attr))) 347 (= (nth 11 attr-target) (nth 11 attr)))
348 (eshell-error (format "%s: `%s' and `%s' are the same file\n" 348 (eshell-error (format "%s: `%s' and `%s' are the same file\n"