github/doom-modeline
1
0
Fork 0
mirror of https://github.com/correl/doom-modeline.git synced 2024-11-27 19:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #9: [Feature] More compatibility with regular Emacs modes.

Browse source
This commit is contained in:
Vincent Zhang 2018-07-11 00:18:17 +08:00
parent 4d4ec2e856
commit 501a930d32
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
doom-modeline.el
View file

@ -1019,14 +1019,37 @@ enabled."
(doom-modeline-def-segment global (doom-modeline-def-segment global
"For the time string and whatever uses global-mode-string." "For the time string and whatever uses global-mode-string."
(when (< 0 (length global-mode-string)) (when (< 0 (length global-mode-string))
'(" " global-mode-string))) '("" global-mode-string " ")))
;;
;; position
;;
;; Be compatible with Emacs25.
(defvar-local doom-modeline-column-zero-based
(or (bound-and-true-p column-number-indicator-zero-based) t))
(defvar-local doom-modeline-percent-position
(or (bound-and-true-p mode-line-percent-position) '(-3 "%p")))
(setq-default mode-line-position
'((line-number-mode
(column-number-mode
(doom-modeline-column-zero-based " %l:%c" " %l:%C")
" %l")
(column-number-mode (doom-modeline-column-zero-based " :%c" " :%C")))
(if doom-modeline-percent-position (" " doom-modeline-percent-position))
(:eval (when (or line-number-mode column-number-mode doom-modeline-percent-position) " "))))
(doom-modeline-def-segment buffer-position
"The buffer position information."
'(" " mode-line-position))
;; ;;
;; Mode lines ;; Mode lines
;; ;;
(doom-modeline-def-modeline main (doom-modeline-def-modeline main
(workspace-number window-number bar matches " " buffer-info " %l:%c %p " selection-info) (workspace-number window-number bar matches " " buffer-info buffer-position " " selection-info)
(buffer-encoding major-mode vcs flycheck global)) (buffer-encoding major-mode vcs flycheck global))
(doom-modeline-def-modeline minimal (doom-modeline-def-modeline minimal
@ -1034,7 +1057,7 @@ enabled."
(media-info major-mode)) (media-info major-mode))
(doom-modeline-def-modeline special (doom-modeline-def-modeline special
(window-number bar matches " " buffer-info-simple " %l:%c %p " selection-info) (window-number bar matches " " buffer-info-simple buffer-position " " selection-info)
(buffer-encoding major-mode flycheck global)) (buffer-encoding major-mode flycheck global))
(doom-modeline-def-modeline project (doom-modeline-def-modeline project