From c2635d53db1b2ced0c4b7c101c10cde1004759e1 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2018 17:30:16 -0500 Subject: [PATCH] private/default: add prefix arg to def-{find-in|browse-in}! macros --- modules/private/default/autoload/default.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/private/default/autoload/default.el b/modules/private/default/autoload/default.el index d51e8ebbd..d1656dfec 100644 --- a/modules/private/default/autoload/default.el +++ b/modules/private/default/autoload/default.el @@ -9,15 +9,15 @@ (error "Couldn't find filename in current buffer"))) ;;;###autoload -(defmacro +default--def-browse-in! (name dir) - (let ((prefix (cdr (doom-module-from-path (or load-file-name byte-compile-current-file))))) +(defmacro +default--def-browse-in! (name dir &optional prefix) + (let ((prefix (or prefix (cdr (doom-module-from-path (or load-file-name byte-compile-current-file)))))) `(defun ,(intern (format "+%s/browse-%s" prefix name)) () (interactive) (doom-project-browse ,dir)))) ;;;###autoload -(defmacro +default--def-find-in! (name dir) - (let ((prefix (cdr (doom-module-from-path (or load-file-name byte-compile-current-file))))) +(defmacro +default--def-find-in! (name dir &optional prefix) + (let ((prefix (or prefix (cdr (doom-module-from-path (or load-file-name byte-compile-current-file)))))) `(defun ,(intern (format "+%s/find-in-%s" prefix name)) () (interactive) (doom-project-find-file ,dir)))) @@ -25,6 +25,7 @@ ;;;###autoload (autoload '+default/browse-project "private/default/autoload/default" nil t) (+default--def-browse-in! project (doom-project-root)) +;; NOTE No need for find-in-project, use `projectile-find-file' ;;;###autoload (autoload '+default/find-in-templates "private/default/autoload/default" nil t) (+default--def-find-in! templates +file-templates-dir)