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

Fix compile-time void-function errors from modeline

Browse source
This commit is contained in:
Henrik Lissner 2018-05-29 14:50:42 +02:00
parent 442aa91eea
commit 456dc62051
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 46 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

44
core/core-ui.el
View file

@ -111,21 +111,25 @@ with `doom//reload-theme').")
;; Modeline library ;; Modeline library
;; ;;
(defvar doom--modeline-alist ()) (defvar doom--modeline-fn-alist ())
(defvar doom--modeline-var-alist ())
(defmacro def-modeline-segment! (name &rest body) (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)))) (let ((sym (intern (format "doom-modeline-segment--%s" name)))
(if (and (symbolp (car body)) (docstring (if (stringp (car body))
(pop body)
(format "%s modeline segment" name))))
(cond ((and (symbolp (car body))
(not (cdr body))) (not (cdr body)))
`(map-put doom--modeline-alist ',name ',(car body)) (map-put doom--modeline-var-alist name (car body))
(let ((sym (intern (format "doom-modeline-segment--%s" name)))) `(map-put doom--modeline-var-alist ',name ',(car body)))
(t
(map-put doom--modeline-fn-alist name sym)
`(progn `(progn
(defun ,sym () (fset ',sym (lambda () ,docstring ,@body))
,(or docstring (format "%s modeline segment" name)) (map-put doom--modeline-fn-alist ',name ',sym)
,@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))))))))
@ -135,12 +139,12 @@ with `doom//reload-theme').")
(dolist (seg segments) (dolist (seg segments)
(cond ((stringp seg) (cond ((stringp seg)
(push seg forms)) (push seg forms))
((setq it (cdr (assq seg doom--modeline-alist))) ((symbolp seg)
(push (cond ((boundp it) it) (cond ((setq it (cdr (assq seg doom--modeline-fn-alist)))
((fboundp it) (list it)) (push (list it) forms))
((error "%s is not a valid segment" seg))) ((setq it (cdr (assq seg doom--modeline-var-alist)))
forms)) (push it forms))
((fboundp seg) (push (list seg) forms)) ((error "%s is not a defined segment" seg))))
((error "%s is not a valid segment" seg)))) ((error "%s is not a valid segment" seg))))
(nreverse forms))) (nreverse forms)))
@ -158,8 +162,12 @@ Example:
(lhs-forms (doom--prepare-modeline-segments lhs)) (lhs-forms (doom--prepare-modeline-segments lhs))
(rhs-forms (doom--prepare-modeline-segments rhs))) (rhs-forms (doom--prepare-modeline-segments rhs)))
`(progn `(progn
(defun ,sym () (fset ',sym
,(concat "Modeline:\n" (format " %s\n %s" lhs rhs)) (lambda ()
,(concat "Modeline:\n"
(format " %s\n %s"
(prin1-to-string lhs)
(prin1-to-string rhs)))
(let ((lhs (list ,@lhs-forms)) (let ((lhs (list ,@lhs-forms))
(rhs (list ,@rhs-forms))) (rhs (list ,@rhs-forms)))
(let ((rhs-str (format-mode-line rhs))) (let ((rhs-str (format-mode-line rhs)))
@ -168,7 +176,7 @@ Example:
" " 'display " " 'display
`((space :align-to (- (+ right right-fringe right-margin) `((space :align-to (- (+ right right-fringe right-margin)
,(+ 1 (string-width rhs-str)))))) ,(+ 1 (string-width rhs-str))))))
rhs-str)))) rhs-str)))))
,(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))))))

12
modules/ui/doom-modeline/config.el
View file

@ -372,7 +372,7 @@ directory, the file name, and its state (modified, read-only or non-existent)."
;; vcs ;; vcs
;; ;;
(defvar +doom-modeline--vcs nil) (defvar-local +doom-modeline--vcs nil)
(defun +doom-modeline--update-vcs () (defun +doom-modeline--update-vcs ()
(setq +doom-modeline--vcs (setq +doom-modeline--vcs
(when (and vc-mode buffer-file-name) (when (and vc-mode buffer-file-name)
@ -410,8 +410,9 @@ directory, the file name, and its state (modified, read-only or non-existent)."
(add-hook 'after-save-hook #'+doom-modeline--update-vcs) (add-hook 'after-save-hook #'+doom-modeline--update-vcs)
(add-hook 'find-file-hook #'+doom-modeline--update-vcs t) (add-hook 'find-file-hook #'+doom-modeline--update-vcs t)
(def-modeline-var! vcs +doom-modeline--vcs (def-modeline-segment! vcs
"Displays the current branch, colored based on its state.") "Displays the current branch, colored based on its state."
+doom-modeline--vcs)
;; ;;
@ -453,9 +454,10 @@ directory, the file name, and its state (modified, read-only or non-existent)."
('errored (+doom-ml-icon "sim_card_alert" "Error" 'doom-modeline-urgent)) ('errored (+doom-ml-icon "sim_card_alert" "Error" 'doom-modeline-urgent))
('interrupted (+doom-ml-icon "pause" "Interrupted" 'font-lock-doc-face))))) ('interrupted (+doom-ml-icon "pause" "Interrupted" 'font-lock-doc-face)))))
(def-modeline-var! flycheck +doom-modeline--flycheck (def-modeline-segment! flycheck
"Displays color-coded flycheck error status in the current buffer with pretty "Displays color-coded flycheck error status in the current buffer with pretty
icons.") icons."
+doom-modeline--flycheck)
;; ;;