From cf39d7ed597c395a2464de463eb2339e5d51d111 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 13 Jul 2020 17:14:12 -0400
Subject: [PATCH] Fix #3532: file API wouldn't work with TRAMP

---
 core/autoload/files.el | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/core/autoload/files.el b/core/autoload/files.el
index 0d4d0aaf8..1fbb99b9e 100644
--- a/core/autoload/files.el
+++ b/core/autoload/files.el
@@ -28,8 +28,7 @@ This is used by `file-exists-p!' and `project-file-exists-p!'."
             (mapcar (doom-rpartial #'doom--resolve-path-forms directory)
                     (cdr spec)))
     (let ((filevar (make-symbol "file")))
-      `(let* ((file-name-handler-alist nil)
-              (,filevar ,spec))
+      `(let ((,filevar ,spec))
          (and (stringp ,filevar)
               ,(if directory
                    `(let ((default-directory ,directory))
@@ -38,21 +37,19 @@ This is used by `file-exists-p!' and `project-file-exists-p!'."
               ,filevar)))))
 
 (defun doom--path (&rest segments)
-  (let (file-name-handler-alist)
-    (let ((dir (pop segments)))
-      (unless segments
-        (setq dir (expand-file-name dir)))
-      (while segments
-        (setq dir (expand-file-name (car segments) dir)
-              segments (cdr segments)))
-      dir)))
+  (let ((dir (pop segments)))
+    (unless segments
+      (setq dir (expand-file-name dir)))
+    (while segments
+      (setq dir (expand-file-name (car segments) dir)
+            segments (cdr segments)))
+    dir))
 
 ;;;###autoload
 (defun doom-glob (&rest segments)
   "Construct a path from SEGMENTS and expand glob patterns.
 Returns nil if the path doesn't exist."
   (let* (case-fold-search
-         file-name-handler-alist
          (dir (apply #'doom--path segments)))
     (if (string-match-p "[[*?]" dir)
         (file-expand-wildcards dir t)
@@ -105,7 +102,7 @@ be relative to it.
 The search recurses up to DEPTH and no further. DEPTH is an integer.
 
 MATCH is a string regexp. Only entries that match it will be included."
-  (let (result file-name-handler-alist)
+  (let (result)
     (dolist (file (mapcan (doom-rpartial #'doom-glob "*") (doom-enlist paths)))
       (cond ((file-directory-p file)
              (appendq!