diff options
| author | Michael Albinus | 2022-10-13 21:13:45 +0200 |
|---|---|---|
| committer | Michael Albinus | 2022-10-13 21:13:45 +0200 |
| commit | cbd04ad3d572850775f18bde868c71abcde733ed (patch) | |
| tree | cca60866632ff253cbc5062ab7483379e81a1376 /lisp/eshell | |
| parent | 10f55975d34dd7299f72fdf8d93fd8cbe2e41e25 (diff) | |
| download | emacs-cbd04ad3d572850775f18bde868c71abcde733ed.tar.gz emacs-cbd04ad3d572850775f18bde868c71abcde733ed.zip | |
Clarify structure of file-attribute's device number
* doc/lispref/buffers.texi (Buffer File Name): Fix description of
buffer-file-number.
* doc/lispref/files.texi (File Attributes): Clarify type of device
number. Describe file-attribute-file-number. (Bug#58446)
* etc/NEWS: Mention file-attribute-file-number.
* lisp/files.el (buffer-file-number, file-attribute-device-number)
(file-attribute-collect): Fix docstring.
(file-attribute-file-number): New defsubst.
(find-buffer-visiting, find-file-noselect)
(set-visited-file-name, basic-save-buffer):
* lisp/startup.el (normal-top-level-add-subdirs-to-load-path):
* lisp/eshell/em-unix.el (eshell-shuffle-files): Use it.
* src/dired.c (Ffile_attributes): Fix docstring.
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/em-unix.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index 40b83010f94..378b0ceeeae 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el | |||
| @@ -372,12 +372,10 @@ Remove the DIRECTORY(ies), if they are empty.") | |||
| 372 | (setq attr (eshell-file-attributes (car files))) | 372 | (setq attr (eshell-file-attributes (car files))) |
| 373 | (file-attribute-inode-number attr-target) | 373 | (file-attribute-inode-number attr-target) |
| 374 | (file-attribute-inode-number attr) | 374 | (file-attribute-inode-number attr) |
| 375 | (equal (file-attribute-inode-number attr-target) | ||
| 376 | (file-attribute-inode-number attr)) | ||
| 377 | (file-attribute-device-number attr-target) | 375 | (file-attribute-device-number attr-target) |
| 378 | (file-attribute-device-number attr) | 376 | (file-attribute-device-number attr) |
| 379 | (equal (file-attribute-device-number attr-target) | 377 | (equal (file-attribute-file-number attr-target) |
| 380 | (file-attribute-device-number attr))) | 378 | (file-attribute-file-number attr))) |
| 381 | (eshell-error (format-message "%s: `%s' and `%s' are the same file\n" | 379 | (eshell-error (format-message "%s: `%s' and `%s' are the same file\n" |
| 382 | command (car files) target))) | 380 | command (car files) target))) |
| 383 | (t | 381 | (t |