* lisp/net/tramp.el (tramp-handle-file-modes): Check for nil file-attributes.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index b044762b70d64dd671eb39fd41001df3a8ad2ceb..b17e4a787cc725ab17e0f88bab931d7fdc879a14 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3152,10 +3152,10 @@ User is always nil."
 
 (defun tramp-handle-file-modes (filename)
   "Like `file-modes' for Tramp files."
-  (let ((truename (or (file-truename filename) filename)))
-    (when (file-exists-p truename)
-      (tramp-mode-string-to-int
-       (tramp-compat-file-attribute-modes (file-attributes truename))))))
+  ;; Starting with Emacs 25.1, `when-let' can be used.
+  (let ((attrs (file-attributes (or (file-truename filename) filename))))
+    (when attrs
+      (tramp-mode-string-to-int (tramp-compat-file-attribute-modes attrs)))))
 
 ;; Localname manipulation functions that grok Tramp localnames...
 (defun tramp-handle-file-name-as-directory (file)