From f156f62479abc452c52339c6c0d6c621d45783c8 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 15 Mar 2017 22:59:21 -0400 Subject: [PATCH] Refactor kill-buffer-query-functions functions --- core/core-editor.el | 5 ++--- modules/ui/doom-dashboard/config.el | 10 ++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/core/core-editor.el b/core/core-editor.el index a6d1ac425..97b04e97c 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -69,9 +69,8 @@ ;; don't kill scratch buffers (defun doom|dont-kill-scratch-buffer () - (if (not (eq (buffer-name) "*scratch*")) - t - (ignore (bury-buffer)))) + (or (not (eq (buffer-name) "*scratch*")) + (ignore (bury-buffer)))) (add-hook 'kill-buffer-query-functions 'doom|dont-kill-scratch-buffer) ;; enabled by default in Emacs 25+. No thanks. diff --git a/modules/ui/doom-dashboard/config.el b/modules/ui/doom-dashboard/config.el index 231d49906..fcd98d69a 100644 --- a/modules/ui/doom-dashboard/config.el +++ b/modules/ui/doom-dashboard/config.el @@ -46,12 +46,9 @@ (add-hook 'after-make-frame-functions '+doom-dashboard-deferred-reload) (add-hook! 'window-setup-hook (add-hook! 'kill-buffer-query-functions - (if (not (+doom-dashboard-p)) - t - (ignore - (ignore-errors (+doom-dashboard-force-reload)) - (bury-buffer)))) - + (or (not (+doom-dashboard-p)) + (ignore (ignore-errors (+doom-dashboard-force-reload)) + (bury-buffer)))) (add-hook 'window-configuration-change-hook '+doom-dashboard-reload) (+doom-dashboard-reload)) @@ -69,6 +66,7 @@ (switch-to-buffer (doom-fallback-buffer))) (defun +doom-dashboard-p (&optional buffer) + "Returns t if BUFFER is the dashboard buffer." (let ((buffer (or buffer (current-buffer)))) (and (buffer-live-p buffer) (eq buffer (doom-fallback-buffer)))))