From ddfcc4299c29180297baa3261d0f74d1ab696eb5 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 28 Mar 2019 02:01:38 -0400 Subject: [PATCH] bin/doom-doctor: minor refactor Also allow Doom init errors to be debugged. --- bin/doom-doctor | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/doom-doctor b/bin/doom-doctor index 2fe9c2241..748193f75 100755 --- a/bin/doom-doctor +++ b/bin/doom-doctor @@ -213,8 +213,8 @@ ;; are certificates validated properly? (section! "Testing your root certificates...") -(cond ((not (string-match-p "\\_" system-configuration-features)) - (warn! "Warning: You didn't install Emacs with gnutls support") +(cond ((not (ignore-errors (gnutls-available-p))) + (warn! "Warning: Emacs wasn't installed with gnutls support") (explain! "This may cause 'pecular error' errors with the Doom doctor, and is likely to " "interfere with package management. Your mileage may vary." @@ -226,7 +226,7 @@ " brew install emacs-plus")))) ((not (fboundp 'url-retrieve-synchronously)) - (error! "Can't find url-retrieve-synchronously function. Are you running Emacs 24+?")) + (error! "Can't find url-retrieve-synchronously function. Are you sure you're on Emacs 24+?")) ((or (executable-find "gnutls-cli") (executable-find "openssl")) @@ -282,7 +282,7 @@ ;; --- are your modules set up properly? ---------------------- -(condition-case ex +(condition-case-unless-debug ex (let ((inhibit-message t) (after-init-time (current-time)) noninteractive)