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

Optimize mode-line segments that are just variables

Browse source
This commit is contained in:
Henrik Lissner 2018-05-27 22:31:08 +02:00
parent e5efd3b673
commit 376adde0d8
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
core/core-ui.el
View file

@ -111,22 +111,38 @@ with `doom//reload-theme').")
;; Modeline library ;; Modeline library
;; ;;
(defmacro def-modeline-segment! (name &rest forms) (defvar doom--modeline-alist ())
(defmacro def-modeline-segment! (name &rest body)
"Defines a modeline segment and byte compiles it." "Defines a modeline segment and byte compiles it."
(declare (indent defun) (doc-string 2)) (declare (indent defun) (doc-string 2))
(let ((docstring (if (stringp (car body)) (pop body))))
(if (and (symbolp (car body))
(not (cdr body)))
`(map-put doom--modeline-alist ',name ',(car body))
(let ((sym (intern (format "doom-modeline-segment--%s" name)))) (let ((sym (intern (format "doom-modeline-segment--%s" name))))
`(progn `(progn
(defun ,sym () ,@forms) (defun ,sym ()
,(or docstring (format "%s modeline segment" name))
,@body)
(map-put doom--modeline-alist ',name ',sym)
,(unless (bound-and-true-p byte-compile-current-file) ,(unless (bound-and-true-p byte-compile-current-file)
`(let (byte-compile-warnings) `(let (byte-compile-warnings)
(byte-compile #',sym)))))) (byte-compile #',sym))))))))
(defsubst doom--prepare-modeline-segments (segments) (defsubst doom--prepare-modeline-segments (segments)
(cl-loop for seg in segments (let (forms it)
if (stringp seg) (dolist (seg segments)
collect seg (cond ((stringp seg)
else (push seg forms))
collect (list (intern (format "doom-modeline-segment--%s" (symbol-name seg)))))) ((setq it (cdr (assq seg doom--modeline-alist)))
(push (cond ((boundp it) it)
((fboundp it) (list it))
((error "%s is not a valid segment" seg)))
forms))
((fboundp seg) (push (list seg) forms))
((error "%s is not a valid segment" seg))))
(nreverse forms)))
(defmacro def-modeline! (name lhs &optional rhs) (defmacro def-modeline! (name lhs &optional rhs)
"Defines a modeline format and byte-compiles it. NAME is a symbol to identify "Defines a modeline format and byte-compiles it. NAME is a symbol to identify