diff options
| author | Michael Albinus | 2015-12-01 13:12:18 +0100 |
|---|---|---|
| committer | Michael Albinus | 2015-12-01 13:12:18 +0100 |
| commit | 57062fcfad3ccb1d096c3a95cbdc2c70f44ea732 (patch) | |
| tree | c253611ae4c1075f0c13fbf0f223e6976c0f7676 | |
| parent | 407cde8355468b16fbc04433c911515254e5dc1e (diff) | |
| download | emacs-57062fcfad3ccb1d096c3a95cbdc2c70f44ea732.tar.gz emacs-57062fcfad3ccb1d096c3a95cbdc2c70f44ea732.zip | |
Check `file-remote-p' over absolute files names in files.el
* lisp/files.el (directory-files-recursively)
(get-free-disk-space): Check `file-remote-p' over absolute files names.
| -rw-r--r-- | lisp/files.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/files.el b/lisp/files.el index 0397f650163..e892ac6b94b 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -753,7 +753,7 @@ If INCLUDE-DIRECTORIES, also include directories that have matching names." | |||
| 753 | (files nil) | 753 | (files nil) |
| 754 | ;; When DIR is "/", remote file names like "/method:" could | 754 | ;; When DIR is "/", remote file names like "/method:" could |
| 755 | ;; also be offered. We shall suppress them. | 755 | ;; also be offered. We shall suppress them. |
| 756 | (tramp-mode (and tramp-mode (file-remote-p dir)))) | 756 | (tramp-mode (and tramp-mode (file-remote-p (expand-file-name dir))))) |
| 757 | (dolist (file (sort (file-name-all-completions "" dir) | 757 | (dolist (file (sort (file-name-all-completions "" dir) |
| 758 | 'string<)) | 758 | 'string<)) |
| 759 | (unless (member file '("./" "../")) | 759 | (unless (member file '("./" "../")) |
| @@ -6247,7 +6247,7 @@ invokes the program specified by `directory-free-space-program' | |||
| 6247 | and `directory-free-space-args'. If the system call or program | 6247 | and `directory-free-space-args'. If the system call or program |
| 6248 | is unsuccessful, or if DIR is a remote directory, this function | 6248 | is unsuccessful, or if DIR is a remote directory, this function |
| 6249 | returns nil." | 6249 | returns nil." |
| 6250 | (unless (file-remote-p dir) | 6250 | (unless (file-remote-p (expand-file-name dir)) |
| 6251 | ;; Try to find the number of free blocks. Non-Posix systems don't | 6251 | ;; Try to find the number of free blocks. Non-Posix systems don't |
| 6252 | ;; always have df, but might have an equivalent system call. | 6252 | ;; always have df, but might have an equivalent system call. |
| 6253 | (if (fboundp 'file-system-info) | 6253 | (if (fboundp 'file-system-info) |