images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-10 17:59:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docs

Browse Source
This commit is contained in:
dgames 2021-06-10 20:23:39 -04:00
commit 8a870c093a
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vendor/clink.lua vendored
View File

@ -420,17 +420,6 @@ local function git_prompt_filter()
return false return false
end end
end end
else
if git_dir then
local branch = get_git_branch(git_dir)
local color
if branch then
color = colors.nostatus
clink.prompt.value = string.gsub(clink.prompt.value, "{git}", color.."("..verbatim(branch)..")")
return false
end
end
end end
-- No git present or not in git file -- No git present or not in git file
@ -446,14 +435,8 @@ local function hg_prompt_filter()
if hg_dir then if hg_dir then
-- Colors for mercurial status -- Colors for mercurial status
local colors = { local colors = {
<<<<<<< HEAD
clean = clean_color,
dirty = dirty_color,
nostatus = nostatus_color
=======
clean = get_clean_color(), clean = get_clean_color(),
dirty = get_dirty_color(), dirty = get_dirty_color(),
>>>>>>> 36f4ce0e3c664b23c3652f180b29e9238860b203
} }
local pipe = io.popen("hg branch 2>&1") local pipe = io.popen("hg branch 2>&1")
@ -486,14 +469,8 @@ end
local function svn_prompt_filter() local function svn_prompt_filter()
-- Colors for svn status -- Colors for svn status
local colors = { local colors = {
<<<<<<< HEAD
clean = clean_color,
dirty = dirty_color,
nostatus = nostatus_color
=======
clean = get_clean_color(), clean = get_clean_color(),
dirty = get_dirty_color(), dirty = get_dirty_color(),
>>>>>>> 36f4ce0e3c664b23c3652f180b29e9238860b203
} }
if get_svn_dir() then if get_svn_dir() then

1
vendor/cmder_prompt_config.lua.default vendored
View File

@ -43,4 +43,3 @@ lamb_color = "\x1b[1;30;40m" -- Light Grey = Lambda Color
clean_color = "\x1b[1;37;40m" clean_color = "\x1b[1;37;40m"
dirty_color = "\x1b[33;3m" dirty_color = "\x1b[33;3m"
conflict_color = "\x1b[31;1m" conflict_color = "\x1b[31;1m"
unknown_color = "\x1b[1;30;40m" -- Light Grey = No VCS Status Branch Color