From c1ff03ebed0cf792013d7d59a2db03207a991601 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 26 Dec 2019 02:40:56 -0500 Subject: [PATCH] Expand :local-repo relative to containing file --- core/core-packages.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index f59f82a98..682396a24 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -334,10 +334,16 @@ elsewhere." (plist-put! plist prop val))) ;; Some basic key validation; error if you're not using a valid key (condition-case e - (cl-destructuring-bind - (&key _local-repo _files _flavor _no-build - _type _repo _host _branch _remote _nonrecursive _fork _depth) - (plist-get plist :recipe)) + (when-let (recipe (plist-get plist :recipe)) + (cl-destructuring-bind + (&key local-repo _files _flavor _no-build + _type _repo _host _branch _remote _nonrecursive _fork _depth) + recipe + ;; Expand :local-repo from current directory + (when local-repo + (plist-put! plist :recipe + (plist-put recipe :local-repo + (expand-file-name local-repo ,(dir!))))))) (error (signal 'doom-package-error (cons ,(symbol-name name)