emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-25 57062fc: Check `file-remote-p' over absolute file


From: Michael Albinus
Subject: [Emacs-diffs] emacs-25 57062fc: Check `file-remote-p' over absolute files names in files.el
Date: Tue, 01 Dec 2015 12:12:35 +0000

branch: emacs-25
commit 57062fcfad3ccb1d096c3a95cbdc2c70f44ea732
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    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.
---
 lisp/files.el |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index 0397f65..e892ac6 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -753,7 +753,7 @@ If INCLUDE-DIRECTORIES, also include directories that have 
matching names."
        (files nil)
        ;; When DIR is "/", remote file names like "/method:" could
        ;; also be offered.  We shall suppress them.
-       (tramp-mode (and tramp-mode (file-remote-p dir))))
+       (tramp-mode (and tramp-mode (file-remote-p (expand-file-name dir)))))
     (dolist (file (sort (file-name-all-completions "" dir)
                        'string<))
       (unless (member file '("./" "../"))
@@ -6247,7 +6247,7 @@ invokes the program specified by 
`directory-free-space-program'
 and `directory-free-space-args'.  If the system call or program
 is unsuccessful, or if DIR is a remote directory, this function
 returns nil."
-  (unless (file-remote-p dir)
+  (unless (file-remote-p (expand-file-name dir))
     ;; Try to find the number of free blocks.  Non-Posix systems don't
     ;; always have df, but might have an equivalent system call.
     (if (fboundp 'file-system-info)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]