refactor(lib): deprecate doom-dir

This function never really added much value over doom-path or
file-name-concat, so I'm phasing it out.
This commit is contained in:
Henrik Lissner 2022-09-06 21:12:16 +02:00
parent f66d9e1f0e
commit e986d6bef9
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
3 changed files with 4 additions and 9 deletions

View file

@ -41,8 +41,8 @@
#'doom-glob (if (string-prefix-p ":" scope) #'doom-glob (if (string-prefix-p ":" scope)
(format "%s" (substring scope 1)) (format "%s" (substring scope 1))
(format "*/%s" scope))) (format "*/%s" scope)))
(list (doom-dir (dir!) "../modules/") (list (doom-path (dir!) "../modules/")
(doom-dir doom-user-dir "modules/")))) (doom-path doom-user-dir "modules/"))))
(defun ci-check-docs-scope (scope _) (defun ci-check-docs-scope (scope _)
"Allow any filename in docs/* as a scope for docs commits." "Allow any filename in docs/* as a scope for docs commits."

View file

@ -119,7 +119,7 @@ in."
(let* ((xdg-dir (concat (or (getenv "XDG_CONFIG_HOME") (let* ((xdg-dir (concat (or (getenv "XDG_CONFIG_HOME")
"~/.config") "~/.config")
"/doom/")) "/doom/"))
(doom-dir (or (getenv "DOOMDIR") (doom-path (or (getenv "DOOMDIR")
"~/.doom.d/")) "~/.doom.d/"))
(dir (if (file-directory-p xdg-dir) (dir (if (file-directory-p xdg-dir)
xdg-dir xdg-dir

View file

@ -72,12 +72,7 @@ If the glob ends in a slash, only returns matching directories."
(file-expand-wildcards path full?)))) (file-expand-wildcards path full?))))
;;;###autoload ;;;###autoload
(defun doom-dir (&rest segments) (define-obsolete-function-alias 'doom-dir 'doom-path "3.0.0")
"Constructs a path from SEGMENTS.
See `doom-path'.
Ignores `nil' elements in SEGMENTS."
(when-let (path (doom-path segments))
(directory-file-name path)))
;;;###autoload ;;;###autoload
(cl-defun doom-files-in (cl-defun doom-files-in