From b37aadec91fb245e7850a59aedc10834f0d42bc3 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 23 Mar 2017 19:49:58 -0400 Subject: [PATCH] General cleanup + refactor --- core/core-lib.el | 4 ++-- core/core-ui.el | 1 + core/core.el | 2 +- modules/lang/processing/config.el | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/core-lib.el b/core/core-lib.el index e05370ade..720f622e1 100644 --- a/core/core-lib.el +++ b/core/core-lib.el @@ -275,8 +275,8 @@ using `doom-fetch'." (let ((bootstrap (assq id doom-bootstraps))) (message "[%s] BOOTSTRAP START" id) (with-demoted-errors (format "[%s] ERROR: %%s" id) - (unless (funcall (cdr bootstrap)) - (message "[%s] DONE (already bootstrapped)" id))))))) + (message "[%s] %s" + id (if (funcall (cdr bootstrap)) "SKIPPED (nothing to do)" "DONE"))))))) (provide 'core-lib) ;;; core-lib.el ends here diff --git a/core/core-ui.el b/core/core-ui.el index 108cd0455..a982fae7b 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -116,6 +116,7 @@ disabled.") :config (setq highlight-indent-guides-method 'character) + ;; FIXME highlight-indent-guides doesn't take advantage of injected whitespace (defun doom|inject-trailing-whitespace (&optional start end) "The opposite of `delete-trailing-whitespace'. Injects whitespace into buffer so that `highlight-indent-guides-mode' will display uninterrupted indent diff --git a/core/core.el b/core/core.el index a992ebbf4..899ea0ee9 100644 --- a/core/core.el +++ b/core/core.el @@ -154,8 +154,8 @@ enable multiple minor modes for the same regexp.") (with-demoted-errors "AUTOLOAD ERROR: %s" (require 'autoloads doom-autoload-file t)) - (require 'core-ui) ; draw me like one of your French editors (unless noninteractive + (require 'core-ui) ; draw me like one of your French editors (require 'core-popups) ; taming sudden yet inevitable windows (require 'core-editor) ; baseline configuration for text editing (require 'core-projects) ; making Emacs project-aware diff --git a/modules/lang/processing/config.el b/modules/lang/processing/config.el index 6538ee032..2d288a07e 100644 --- a/modules/lang/processing/config.el +++ b/modules/lang/processing/config.el @@ -18,7 +18,7 @@ (setq processing-location "/usr/local/bin/processing-java" processing-application-dir "/Applications/Processing.app" - processing-sketchbook-dir "~/Dropbox/work/pde" + processing-sketchbook-dir "~/work/pde" processing-output-dir "/tmp") (map! :map processing-mode-map