From aff5cc5b28883d1fc1bbdfd955e09b24e7162674 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 22 Aug 2019 13:03:12 -0400
Subject: [PATCH] Move file-exists-p! to core/autoload/files.el

---
 core/autoload/files.el | 50 ++++++++++++++++++++++++++++++++++++++++++
 core/core-lib.el       | 49 -----------------------------------------
 2 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/core/autoload/files.el b/core/autoload/files.el
index 2bd07579d..f93cce7fc 100644
--- a/core/autoload/files.el
+++ b/core/autoload/files.el
@@ -1,5 +1,44 @@
 ;;; core/autoload/files.el -*- lexical-binding: t; -*-
 
+(defun doom--resolve-path-forms (spec &optional directory)
+  "Converts a simple nested series of or/and forms into a series of
+`file-exists-p' checks.
+
+For example
+
+  (doom--resolve-path-forms
+    '(or A (and B C))
+    \"~\")
+
+Returns (approximately):
+
+  '(let* ((_directory \"~\")
+          (A (expand-file-name A _directory))
+          (B (expand-file-name B _directory))
+          (C (expand-file-name C _directory)))
+     (or (and (file-exists-p A) A)
+         (and (if (file-exists-p B) B)
+              (if (file-exists-p C) C))))
+
+This is used by `file-exists-p!' and `project-file-exists-p!'."
+  (declare (pure t) (side-effect-free t))
+  (let ((exists-fn (if (fboundp 'projectile-file-exists-p)
+                       #'projectile-file-exists-p
+                     #'file-exists-p)))
+    (if (and (listp spec)
+             (memq (car spec) '(or and)))
+        (cons (car spec)
+              (mapcar (doom-rpartial #'doom--resolve-path-forms directory)
+                      (cdr spec)))
+      (let ((filevar (make-symbol "file")))
+        `(let* ((file-name-handler-alist nil)
+                (,filevar ,spec))
+           (and ,(if directory
+                     `(let ((default-directory ,directory))
+                        (,exists-fn ,filevar))
+                   (list exists-fn filevar))
+                ,filevar))))))
+
 (defun doom--path (&rest segments)
   (let (file-name-handler-alist)
     (let ((dir (pop segments)))
@@ -98,6 +137,17 @@ MATCH is a string regexp. Only entries that match it will be included."
                    result))))
     result))
 
+;;;###autoload
+(defmacro file-exists-p! (files &optional directory)
+  "Returns non-nil if the FILES in DIRECTORY all exist.
+
+DIRECTORY is a path; defaults to `default-directory'.
+
+Returns the last file found to meet the rules set by FILES, which can be a
+single file or nested compound statement of `and' and `or' statements."
+  `(let ((p ,(doom--resolve-path-forms files directory)))
+     (and p (expand-file-name p ,directory))))
+
 
 ;;
 ;;; Helpers
diff --git a/core/core-lib.el b/core/core-lib.el
index 2b08cafaa..06547f4d2 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -42,45 +42,6 @@ means to remove KEY from ALIST if the new value is `eql' to DEFAULT."
 ;;
 ;;; Helpers
 
-(defun doom--resolve-path-forms (spec &optional directory)
-  "Converts a simple nested series of or/and forms into a series of
-`file-exists-p' checks.
-
-For example
-
-  (doom--resolve-path-forms
-    '(or A (and B C))
-    \"~\")
-
-Returns (approximately):
-
-  '(let* ((_directory \"~\")
-          (A (expand-file-name A _directory))
-          (B (expand-file-name B _directory))
-          (C (expand-file-name C _directory)))
-     (or (and (file-exists-p A) A)
-         (and (if (file-exists-p B) B)
-              (if (file-exists-p C) C))))
-
-This is used by `file-exists-p!' and `project-file-exists-p!'."
-  (declare (pure t) (side-effect-free t))
-  (let ((exists-fn (if (fboundp 'projectile-file-exists-p)
-                       #'projectile-file-exists-p
-                     #'file-exists-p)))
-    (if (and (listp spec)
-             (memq (car spec) '(or and)))
-        (cons (car spec)
-              (mapcar (doom-rpartial #'doom--resolve-path-forms directory)
-                      (cdr spec)))
-      (let ((filevar (make-symbol "file")))
-        `(let* ((file-name-handler-alist nil)
-                (,filevar ,spec))
-           (and ,(if directory
-                     `(let ((default-directory ,directory))
-                        (,exists-fn ,filevar))
-                   (list exists-fn filevar))
-                ,filevar))))))
-
 (defun doom--resolve-hook-forms (hooks)
   "Converts a list of modes into a list of hook symbols.
 
@@ -364,16 +325,6 @@ If N and M = 1, there's no benefit to using this macro over `remove-hook'.
    (cl-loop for (_var _val hook fn) in (doom--setq-hook-fns hooks vars 'singles)
             collect `(remove-hook ',hook #',fn))))
 
-(defmacro file-exists-p! (files &optional directory)
-  "Returns non-nil if the FILES in DIRECTORY all exist.
-
-DIRECTORY is a path; defaults to `default-directory'.
-
-Returns the last file found to meet the rules set by FILES, which can be a
-single file or nested compound statement of `and' and `or' statements."
-  `(let ((p ,(doom--resolve-path-forms files directory)))
-     (and p (expand-file-name p ,directory))))
-
 (defmacro load! (filename &optional path noerror)
   "Load a file relative to the current executing file (`load-file-name').