Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge from develop branch. #5

Merged
merged 57 commits into from
Jul 5, 2018
Merged

Merge from develop branch. #5

Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
ababcb4
Merge from develop branch of doom-theme.
seagle0128 Jun 13, 2018
553f1a8
Remove memoize dependency.
seagle0128 Jun 13, 2018
aee92fa
Update libs.
seagle0128 Jun 13, 2018
0509ac4
Fix eldoc in minibuffer.
seagle0128 Jun 13, 2018
f98597f
Fix face of eldoc-in-minibuffer.
seagle0128 Jun 13, 2018
25c5d29
Fix: quote -> backquote.
seagle0128 Jun 14, 2018
8bf477c
Merge branch 'develop' of https://github.com/seagle0128/doom-modeline…
seagle0128 Jun 14, 2018
af221ea
Fix: Symbol’s value as variable is void: doom-modeline-fn-alist.
seagle0128 Jun 15, 2018
0946408
Remove dash.
seagle0128 Jun 15, 2018
50dd005
Fix warnings.
seagle0128 Jun 17, 2018
9a8231c
Fix: when-let for Emacs26.
seagle0128 Jun 17, 2018
b66b92c
Add GLP3 license.
seagle0128 Jun 17, 2018
2d9ce25
Update format.
seagle0128 Jun 19, 2018
0234007
Merge new codes and fix warnings.
seagle0128 Jun 19, 2018
747f060
Remove `doom-modeline-add-hook!`.
seagle0128 Jun 19, 2018
998cfe1
Minor fix.
seagle0128 Jun 19, 2018
64404ed
Remove `doom-modeline-add-transient-hook!`.
seagle0128 Jun 19, 2018
57fa2b2
Fix: `doom-modeline-set`.
seagle0128 Jun 19, 2018
03658c4
Fix: `doom-modeline-vspc`.
seagle0128 Jun 19, 2018
96d6fda
Fix anzu issue.
seagle0128 Jun 19, 2018
55269e7
Fix for `evil-anzu`.
seagle0128 Jun 19, 2018
f281bd8
Refactor.
seagle0128 Jun 19, 2018
1a98d96
Silence compiler warnings.
seagle0128 Jun 20, 2018
04641d5
Fix typo.
seagle0128 Jun 21, 2018
14e4b8b
Disable anzu modeline.
seagle0128 Jun 21, 2018
616fdab
Fix: set current window after switching window.
seagle0128 Jun 21, 2018
2beb802
Fix: set current window after switching window via click.
seagle0128 Jun 21, 2018
e693642
Update functions for icons.
seagle0128 Jun 21, 2018
e714440
Support versions including Python, Ruby and Golang.
seagle0128 Jun 21, 2018
ff3a35a
Merge branch 'develop' of https://github.com/seagle0128/doom-modeline…
seagle0128 Jun 21, 2018
0db4523
Enable window-number in main.
seagle0128 Jun 22, 2018
d4179d8
Update README.
seagle0128 Jun 22, 2018
f3abba2
Update README.
seagle0128 Jun 25, 2018
c712afc
Update README.
seagle0128 Jun 25, 2018
2c7c908
Fix: doom-column -> doom-modeline-column.
seagle0128 Jun 26, 2018
0cc7118
Fix warnings.
seagle0128 Jun 26, 2018
2383b1c
Update vcs.
seagle0128 Jun 26, 2018
c354cdd
Remove `map`.
seagle0128 Jun 27, 2018
bd09759
Fix: update vcs.
seagle0128 Jun 27, 2018
10ec55a
Update vcs state in mode-line after refreshing in magit.
seagle0128 Jun 28, 2018
ae9d073
Fix issues according to feedbacks from mepla.
seagle0128 Jun 30, 2018
871f5f8
Merge branch 'develop' of https://github.com/seagle0128/doom-modeline…
seagle0128 Jun 30, 2018
69e4731
Update comments.
seagle0128 Jul 2, 2018
f6f73dd
Add window number for special, project and media modeline.
seagle0128 Jul 2, 2018
335074b
Autoload more functions.
seagle0128 Jul 2, 2018
ed7027d
Set special modeline for org-src-mode.
seagle0128 Jul 2, 2018
b8e73dc
Show window number while the count of windows is greater than 2.
seagle0128 Jul 2, 2018
4ef93c7
Ignore minibuffer while counting windows.
seagle0128 Jul 2, 2018
28000c4
Support winum-mode.
seagle0128 Jul 2, 2018
ff3bd48
Always show window numbers in all frames.
seagle0128 Jul 2, 2018
28f91fd
Fix comments.
seagle0128 Jul 3, 2018
258179b
Fix env versions on mode-line.
seagle0128 Jul 3, 2018
926a833
Fix errors for env versions in mode-line.
seagle0128 Jul 3, 2018
774879e
Update README and package descriptions.
seagle0128 Jul 5, 2018
1e655da
Merge branch 'develop' of https://github.com/seagle0128/doom-modeline…
seagle0128 Jul 5, 2018
f1892f8
Merge branch 'master' into develop
seagle0128 Jul 5, 2018
b352592
Update doom-modeline.el
seagle0128 Jul 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix: update vcs.
  • Loading branch information
@seagle0128
seagle0128 committed Jun 27, 2018
commit bd097590a28f6a0a3ba388456ffbbb73af1a3336
72 changes: 32 additions & 40 deletions doom-modeline.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,48 +613,40 @@ directory, the file name, and its state (modified, read-only or non-existent)."
;; vcs
;;

(defvar-local doom-modeline--vcs nil)
(defun doom-modeline--update-vcs ()
"Update vsc status in mode-line."
(setq doom-modeline--vcs
(when (and vc-mode buffer-file-name)
(let* ((backend (vc-backend buffer-file-name))
(state (vc-state buffer-file-name backend)))
(let ((face 'mode-line-inactive)
(active (doom-modeline--active))
(all-the-icons-default-adjust -0.1))
(concat (if (display-graphic-p) " ")
(cond ((memq state '(edited added))
(if active (setq face 'doom-modeline-info))
(doom-modeline-maybe-icon-octicon
"git-compare"
:face face
:v-adjust -0.05))
((eq state 'needs-merge)
(if active (setq face 'doom-modeline-info))
(doom-modeline-maybe-icon-octicon "git-merge" :face face))
((eq state 'needs-update)
(if active (setq face 'doom-modeline-warning))
(doom-modeline-maybe-icon-octicon "arrow-down" :face face))
((memq state '(removed conflict unregistered))
(if active (setq face 'doom-modeline-urgent))
(doom-modeline-maybe-icon-octicon "alert" :face face))
(t
(if active (setq face 'font-lock-doc-face))
(doom-modeline-maybe-icon-octicon
"git-branch"
:face face
:v-adjust -0.05)))
" "
(propertize (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2))
'face (if active face))
" "))))))
(add-hook 'after-save-hook #'doom-modeline--update-vcs)
(add-hook 'find-file-hook #'doom-modeline--update-vcs t)

(doom-modeline-def-segment vcs
"Displays the current branch, colored based on its state."
doom-modeline--vcs)
(when (and vc-mode buffer-file-name)
(let* ((backend (vc-backend buffer-file-name))
(state (vc-state buffer-file-name backend)))
(let ((face 'mode-line-inactive)
(active (doom-modeline--active))
(all-the-icons-default-adjust -0.1))
(concat (if (display-graphic-p) " ")
(cond ((memq state '(edited added))
(if active (setq face 'doom-modeline-info))
(doom-modeline-maybe-icon-octicon
"git-compare"
:face face
:v-adjust -0.05))
((eq state 'needs-merge)
(if active (setq face 'doom-modeline-info))
(doom-modeline-maybe-icon-octicon "git-merge" :face face))
((eq state 'needs-update)
(if active (setq face 'doom-modeline-warning))
(doom-modeline-maybe-icon-octicon "arrow-down" :face face))
((memq state '(removed conflict unregistered))
(if active (setq face 'doom-modeline-urgent))
(doom-modeline-maybe-icon-octicon "alert" :face face))
(t
(if active (setq face 'font-lock-doc-face))
(doom-modeline-maybe-icon-octicon
"git-branch"
:face face
:v-adjust -0.05)))
" "
(propertize (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2))
'face (if active face))
" ")))))


;;
Expand Down