From fa98551d19101877158fcee40ea348179eabe5c9 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 13 Mar 2019 20:20:19 -0400 Subject: [PATCH] tools/vterm: minor refactor Don't end warnings in punctuation, and throw error if modules support is missing. --- modules/tools/vterm/autoload.el | 4 ++++ modules/tools/vterm/config.el | 2 +- modules/tools/vterm/doctor.el | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/tools/vterm/autoload.el b/modules/tools/vterm/autoload.el index 52f663a73..d3b36d73a 100644 --- a/modules/tools/vterm/autoload.el +++ b/modules/tools/vterm/autoload.el @@ -5,6 +5,8 @@ "Open a terminal buffer in the current window. If ARG (universal argument) is non-nil, cd into the current project's root." (interactive "P") + (unless (fboundp 'module-load) + (user-error "Your build of Emacs lacks dynamic modules support and cannot load vterm")) (let ((default-directory (if arg (or (doom-project-root) default-directory) @@ -16,6 +18,8 @@ non-nil, cd into the current project's root." "Open a terminal popup window. If ARG (universal argument) is non-nil, cd into the current project's root." (interactive "P") + (unless (fboundp 'module-load) + (user-error "Your build of Emacs lacks dynamic modules support and cannot load vterm")) (let ((default-directory (if arg (or (doom-project-root) default-directory) diff --git a/modules/tools/vterm/config.el b/modules/tools/vterm/config.el index ab89ee5ee..900678c4a 100644 --- a/modules/tools/vterm/config.el +++ b/modules/tools/vterm/config.el @@ -3,7 +3,7 @@ (def-package! vterm :when (fboundp 'module-load) :defer t - :init (setq vterm-install t) + :preface (setq vterm-install t) :config (set-env! "SHELL") (set-popup-rule! "^vterm" :size 0.25 :vslot -4 :select t :quit nil :ttl 0) diff --git a/modules/tools/vterm/doctor.el b/modules/tools/vterm/doctor.el index 866c4b62d..0700bafdb 100644 --- a/modules/tools/vterm/doctor.el +++ b/modules/tools/vterm/doctor.el @@ -1,13 +1,13 @@ ;;; tools/vterm/doctor.el -*- lexical-binding: t; -*- (unless (executable-find "vterm-ctrl") - (warn! "Couldn't find libvterm. Vterm module won't compile.")) + (warn! "Couldn't find libvterm. Vterm module won't compile")) (unless (executable-find "make") - (warn! "Couldn't find make command. Vterm module won't compile.")) + (warn! "Couldn't find make command. Vterm module won't compile")) (unless (executable-find "cmake") (warn! "Couldn't find cmake command. Vterm module won't compile")) (unless (fboundp 'module-load) - (warn! "Your emacs don't have MODULES support. Vterm module won't work.")) + (warn! "Your emacs doesn't have MODULES support. Vterm module won't work"))