emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't chase symlinks

Browse source 
This should make more exotic symlink config setups viable, but should
also speed up a few internal operations. There are too many possible
symlink configurations to support them all, however.
This commit is contained in:
Henrik Lissner 2020-12-11 05:03:42 -05:00
parent 863063b60d
commit 07db84bfe2
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/core-modules.el
View file

@ -203,7 +203,7 @@ This doesn't require modules to be enabled. For enabled modules us
for default-directory in doom-modules-dirs for default-directory in doom-modules-dirs
for path = (concat category "/" module "/" file) for path = (concat category "/" module "/" file)
if (file-exists-p path) if (file-exists-p path)
return (file-truename path))) return (expand-file-name path)))
(defun doom-module-from-path (&optional path enabled-only) (defun doom-module-from-path (&optional path enabled-only)
"Returns a cons cell (CATEGORY . MODULE) derived from PATH (a file path). "Returns a cons cell (CATEGORY . MODULE) derived from PATH (a file path).
@ -218,7 +218,7 @@ If ENABLED-ONLY, return nil if the containing module isn't enabled."
(ignore-errors (ignore-errors
(doom-module-from-path (file!)))) (doom-module-from-path (file!))))
(let* ((file-name-handler-alist nil) (let* ((file-name-handler-alist nil)
(path (file-truename (or path (file!))))) (path (expand-file-name (or path (file!)))))
(save-match-data (save-match-data
(cond ((string-match "/modules/\\([^/]+\\)/\\([^/]+\\)\\(?:/.*\\)?$" path) (cond ((string-match "/modules/\\([^/]+\\)/\\([^/]+\\)\\(?:/.*\\)?$" path)
(when-let* ((category (doom-keyword-intern (match-string 1 path))) (when-let* ((category (doom-keyword-intern (match-string 1 path)))
@ -226,9 +226,11 @@ If ENABLED-ONLY, return nil if the containing module isn't enabled."
(and (or (null enabled-only) (and (or (null enabled-only)
(doom-module-p category module)) (doom-module-p category module))
(cons category module)))) (cons category module))))
((file-in-directory-p path doom-core-dir) ((or (string-match-p (concat "^" (regexp-quote doom-core-dir)) path)
(file-in-directory-p path doom-core-dir))
(cons :core (intern (file-name-base path)))) (cons :core (intern (file-name-base path))))
((file-in-directory-p path doom-private-dir) ((or (string-match-p (concat "^" (regexp-quote doom-private-dir)) path)
(file-in-directory-p path doom-private-dir))
(cons :private (intern (file-name-base path))))))))) (cons :private (intern (file-name-base path)))))))))
(defun doom-module-load-path (&optional module-dirs) (defun doom-module-load-path (&optional module-dirs)