From 40eda029ab6eb9250afa8ebd0fe8710ea7dd6650 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 20 Aug 2018 00:31:48 +0200 Subject: [PATCH] Fix "Select a root directory" prompts Occurs when :feature snippets is disabled, but :feature file-templates is enabled. --- modules/feature/file-templates/config.el | 29 +++++++++--------------- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/modules/feature/file-templates/config.el b/modules/feature/file-templates/config.el index 4a0b0a9ab..f7fcaab41 100644 --- a/modules/feature/file-templates/config.el +++ b/modules/feature/file-templates/config.el @@ -124,22 +124,15 @@ must be non-read-only, empty, and there must be a rule in ;; Bootstrap ;; -(def-package! yasnippet - :unless (featurep! :feature snippets) - :config - (setq yas-verbosity (if doom-debug-mode 3 0) - yas-prompt-functions (delq #'yas-dropdown-prompt yas-prompt-functions) - yas-snippet-dirs nil) - ;; Exit snippets on ESC from normal mode - (add-hook 'doom-escape-hook #'yas-abort-snippet) - ;; - (yas-reload-all)) - - -(defun +file-templates|init () - (after! yasnippet - (add-to-list 'yas-snippet-dirs '+file-templates-dir 'append #'eq)) - (add-hook 'find-file-hook #'+file-templates|check)) - -(add-hook 'doom-post-init-hook #'+file-templates|init) +(after! yasnippet + (if (featurep! :feature snippets) + (add-to-list 'yas-snippet-dirs '+file-templates-dir 'append #'eq) + (setq yas-prompt-functions (delq #'yas-dropdown-prompt yas-prompt-functions) + yas-snippet-dirs '(+file-templates-dir)) + ;; Exit snippets on ESC from normal mode + (add-hook 'doom-escape-hook #'yas-abort-snippet) + ;; Ensure file templates in `+file-templates-dir' are visible + (yas-reload-all))) +;; +(add-hook 'find-file-hook #'+file-templates|check)