From eeffc1f5ae36284e8d08c0f529e115032d7e0d04 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 14 Oct 2022 21:32:15 +0200 Subject: Rename `file-attribute-file-number' to `file-attribute-file-identifier' * doc/lispref/files.texi (File Attributes): * etc/NEWS: * lisp/files.el (find-buffer-visiting, find-file-noselect) (set-visited-file-name, basic-save-buffer) (file-attribute-file-identifier): * lisp/startup.el (normal-top-level-add-subdirs-to-load-path): * lisp/eshell/em-unix.el (eshell-shuffle-files): * src/dired.c (Ffile_attributes): Rename `file-attribute-file-number' to `file-attribute-file-identifier'. --- lisp/files.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lisp/files.el') diff --git a/lisp/files.el b/lisp/files.el index dd10f7399cc..3fa0f2f3b81 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2164,7 +2164,7 @@ If there is no such live buffer, return nil." (setq list (cdr list))) found) (let* ((attributes (file-attributes truename)) - (number (file-attribute-file-number attributes)) + (number (file-attribute-file-identifier attributes)) (list (buffer-list)) found) (and buffer-file-numbers-unique (car-safe number) ;Make sure the inode is not just nil. @@ -2367,7 +2367,7 @@ the various files." (let* ((buf (get-file-buffer filename)) (truename (abbreviate-file-name (file-truename filename))) (attributes (file-attributes truename)) - (number (file-attribute-file-number attributes)) + (number (file-attribute-file-identifier attributes)) ;; Find any buffer for a file that has same truename. (other (and (not buf) (find-buffer-visiting @@ -4745,7 +4745,7 @@ the old visited file has been renamed to the new name FILENAME." (setq buffer-file-name truename)))) (setq buffer-file-number (if filename - (file-attribute-file-number (file-attributes buffer-file-name)) + (file-attribute-file-identifier (file-attributes buffer-file-name)) nil)) ;; write-file-functions is normally used for things like ftp-find-file ;; that visit things that are not local files as if they were files. @@ -5734,7 +5734,8 @@ Before and after saving the buffer, this function runs (setq save-buffer-coding-system last-coding-system-used) (setq buffer-file-coding-system last-coding-system-used)) (setq buffer-file-number - (file-attribute-file-number (file-attributes buffer-file-name))) + (file-attribute-file-identifier + (file-attributes buffer-file-name))) (if setmodes (condition-case () (progn @@ -8662,7 +8663,7 @@ It is a nonnegative integer." It is an integer or a cons cell of integers." (nth 11 attributes)) -(defsubst file-attribute-file-number (attributes) +(defsubst file-attribute-file-identifier (attributes) "The inode and device numbers in ATTRIBUTES returned by `file-attributes'. The value is a list of the form (INODENUM DEVICE), where DEVICE could be either a single number or a cons cell of two numbers. -- cgit v1.2.3