diff --git a/core/core-defuns.el b/core/core-defuns.el index a0b8341df..d5976e753 100644 --- a/core/core-defuns.el +++ b/core/core-defuns.el @@ -300,7 +300,7 @@ Examples: (not inhibit-doom)) (doom-mode-init t)) (setq default-directory dir) - (setq mode-line-format (doom-mode-line 'scratch))))) + (setq mode-line-format (doom-modeline 'scratch))))) ;; diff --git a/core/core-modeline.el b/core/core-modeline.el index cdecaa86a..9ebabcadb 100644 --- a/core/core-modeline.el +++ b/core/core-modeline.el @@ -365,7 +365,7 @@ to be enabled." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defun doom-mode-line (&optional id) +(defun doom-modeline (&optional id) `(:eval (let* ((active (eq (selected-window) doom-ml-selected-window)) (lhs (list (propertize " " @@ -392,7 +392,7 @@ to be enabled." ,(1+ (string-width (format-mode-line rhs))))))))) (list lhs middle rhs)))) -(setq-default mode-line-format (doom-mode-line)) +(setq-default mode-line-format (doom-modeline)) ;; @@ -404,7 +404,7 @@ to be enabled." (face-background 'doom-modeline-eldoc-bar) nil)) -(defun doom-eldoc-mode-line () +(defun doom-eldoc-modeline () `(:eval (let ((active (eq (selected-window) doom-ml-selected-window))) (list (list (propertize " " 'display doom-eldoc-modeline-bar) @@ -418,7 +418,7 @@ to be enabled." (str (and (stringp input) (concat " " input))) (len (length str)) (tmp-str str) - (mode-line-format (or (and str (doom-eldoc-mode-line)) + (mode-line-format (or (and str (doom-eldoc-modeline)) mode-line-format)) roll mode-line-in-non-selected-windows) (catch 'break diff --git a/core/defuns/defuns-buffers.el b/core/defuns/defuns-buffers.el index 21ad4ad3d..27ad10a9d 100644 --- a/core/defuns/defuns-buffers.el +++ b/core/defuns/defuns-buffers.el @@ -273,7 +273,7 @@ buffers regardless of project." (new-buf (get-buffer-create "*doom:scratch*"))) (with-current-buffer new-buf (setq default-directory old-project) - (setq mode-line-format (doom-mode-line 'scratch)) + (setq mode-line-format (doom-modeline 'scratch)) (when (and (not (eq major-mode mode)) (functionp mode)) (funcall mode))