emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve modeline function name consistency

Browse source
This commit is contained in:
Henrik Lissner 2016-09-28 13:53:47 +02:00
parent 3eae00e4f9
commit 2f12e49a13
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/core-defuns.el
View file

@ -300,7 +300,7 @@ Examples:
(not inhibit-doom)) (not inhibit-doom))
(doom-mode-init t)) (doom-mode-init t))
(setq default-directory dir) (setq default-directory dir)
(setq mode-line-format (doom-mode-line 'scratch))))) (setq mode-line-format (doom-modeline 'scratch)))))
;; ;;

8
core/core-modeline.el
View file

@ -365,7 +365,7 @@ to be enabled."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun doom-mode-line (&optional id) (defun doom-modeline (&optional id)
`(:eval `(:eval
(let* ((active (eq (selected-window) doom-ml-selected-window)) (let* ((active (eq (selected-window) doom-ml-selected-window))
(lhs (list (propertize " " (lhs (list (propertize " "
@ -392,7 +392,7 @@ to be enabled."
,(1+ (string-width (format-mode-line rhs))))))))) ,(1+ (string-width (format-mode-line rhs)))))))))
(list lhs middle 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) (face-background 'doom-modeline-eldoc-bar)
nil)) nil))
(defun doom-eldoc-mode-line () (defun doom-eldoc-modeline ()
`(:eval `(:eval
(let ((active (eq (selected-window) doom-ml-selected-window))) (let ((active (eq (selected-window) doom-ml-selected-window)))
(list (list (propertize " " 'display doom-eldoc-modeline-bar) (list (list (propertize " " 'display doom-eldoc-modeline-bar)
@ -418,7 +418,7 @@ to be enabled."
(str (and (stringp input) (concat " " input))) (str (and (stringp input) (concat " " input)))
(len (length str)) (len (length str))
(tmp-str 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)) mode-line-format))
roll mode-line-in-non-selected-windows) roll mode-line-in-non-selected-windows)
(catch 'break (catch 'break

2
core/defuns/defuns-buffers.el
View file

@ -273,7 +273,7 @@ buffers regardless of project."
(new-buf (get-buffer-create "*doom:scratch*"))) (new-buf (get-buffer-create "*doom:scratch*")))
(with-current-buffer new-buf (with-current-buffer new-buf
(setq default-directory old-project) (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)) (when (and (not (eq major-mode mode))
(functionp mode)) (functionp mode))
(funcall mode)) (funcall mode))