hiro/doom-modeline
1
0
Fork 0
mirror of https://github.com/vale981/doom-modeline synced 2025-03-05 09:21:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Refactor] Restore to original format while disabling.

Browse source
This commit is contained in:
Vincent Zhang 2021-05-27 15:03:11 +08:00
parent 462c3a617e
commit f963cbb42f
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doom-modeline-core.el
View file

@ -1045,6 +1045,17 @@ If DEFAULT is non-nil, set the default mode-line for all buffers."
((floatp height) (* height (frame-char-height))) ((floatp height) (* height (frame-char-height)))
(t (frame-char-height))))))) (t (frame-char-height)))))))
(defun doom-modeline--original-value (sym)
"Return the original value for SYM, if any.
If SYM has an original value, return it in a list. Return nil
otherwise."
(let* ((orig-val-expr (get sym 'standard-value)))
(when (consp orig-val-expr)
(ignore-errors
(list
(eval (car orig-val-expr)))))))
(defun doom-modeline-add-variable-watcher (symbol watch-function) (defun doom-modeline-add-variable-watcher (symbol watch-function)
"Cause WATCH-FUNCTION to be called when SYMBOL is set if possible. "Cause WATCH-FUNCTION to be called when SYMBOL is set if possible.

18
doom-modeline.el
View file

@ -232,11 +232,6 @@ If DEFAULT is non-nil, set the default mode-line for all buffers."
;; Minor mode ;; Minor mode
;; ;;
(defvar doom-modeline--default-format mode-line-format
"Storage for the default `mode-line-format'.
So it can be restored when `doom-modeline-mode' is disabled.")
(defvar doom-modeline-mode-map (make-sparse-keymap)) (defvar doom-modeline-mode-map (make-sparse-keymap))
;; Suppress warnings ;; Suppress warnings
@ -284,15 +279,14 @@ So it can be restored when `doom-modeline-mode' is disabled.")
(advice-add #'helm-display-mode-line :after #'doom-modeline-set-helm-modeline)) (advice-add #'helm-display-mode-line :after #'doom-modeline-set-helm-modeline))
(progn (progn
;; Restore mode-line ;; Restore mode-line
(setq-default mode-line-format doom-modeline--default-format) (let ((original-format (doom-modeline--original-value 'mode-line-format)))
(dolist (buf (buffer-list)) (setq-default mode-line-format original-format)
(with-current-buffer buf (dolist (buf (buffer-list))
(setq mode-line-format doom-modeline--default-format))) (with-current-buffer buf
(setq mode-line-format original-format))))
;; For two-column editing ;; For two-column editing
(setq 2C-mode-line-format (setq 2C-mode-line-format (doom-modeline--original-value '2C-mode-line-format))
'("-%*- %15b --" (-3 . "%p") "--%[(" mode-name
minor-mode-alist "%n" mode-line-process ")%]%-"))
;; Remove hooks ;; Remove hooks
(remove-hook 'Info-mode-hook #'doom-modeline-set-info-modeline) (remove-hook 'Info-mode-hook #'doom-modeline-set-info-modeline)