From 2b43dd42e2bb23075595ca700d366b291956abb7 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 16 Feb 2018 19:36:32 -0500 Subject: [PATCH] Refactor doom-hide-modeline-mode --- core/core-ui.el | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/core/core-ui.el b/core/core-ui.el index 3613e4aa4..9e703275c 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -79,7 +79,7 @@ with `doom//reload-theme').") ;; A minor mode for hiding the mode-line ;; -(defvar-local doom--modeline-format nil +(defvar doom--modeline-format nil "The modeline format to use when `doom-hide-modeline-mode' is active. Don't set this directly. Let-bind it instead.") @@ -91,18 +91,16 @@ disabled.") "Minor mode to hide the mode-line in the current buffer." :init-value nil :global nil - (cond (doom-hide-modeline-mode - (add-hook 'after-change-major-mode-hook #'doom|hide-modeline-mode-reset nil t) - (setq mode-line-format (or doom--old-modeline-format doom--modeline-format) - doom--old-modeline-format nil)) - (t - (remove-hook 'after-change-major-mode-hook #'doom|hide-modeline-mode-reset t) - (setq mode-line-format doom--old-modeline-format - doom--old-modeline-format nil))) + (if doom-hide-modeline-mode + (progn + (add-hook 'after-change-major-mode-hook #'doom|hide-modeline-mode-reset nil t) + (setq doom--old-modeline-format mode-line-format + mode-line-format doom--modeline-format)) + (remove-hook 'after-change-major-mode-hook #'doom|hide-modeline-mode-reset t) + (setq mode-line-format doom--old-modeline-format)) (force-mode-line-update)) ;; Ensure major-mode or theme changes don't overwrite these variables -(put 'doom--modeline-format 'permanent-local t) (put 'doom--old-modeline-format 'permanent-local t) (put 'doom-hide-modeline-mode 'permanent-local t) (put 'doom-hide-modeline-mode 'permanent-local-hook t)