Skip to content

Commit 01c41a9

Browse files
committed
Merge branch 'master' into more_speed_2
2 parents 7c04ee9 + 219c879 commit 01c41a9

File tree

8 files changed

+12
-15
lines changed

8 files changed

+12
-15
lines changed

.github/workflows/branches.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# Steps represent a sequence of tasks that will be executed as part of the job
2020
steps:
2121
# Checks-out the repository under $GITHUB_WORKSPACE, so the job can access it
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0 # fetch all history for all branches and tags
2525

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
discussions: write
3636
steps:
3737
- name: Check out repository code (Action from GitHub)
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939
with:
4040
fetch-depth: 0
4141

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Checkout repository
48-
uses: actions/checkout@v3
48+
uses: actions/checkout@v4
4949

5050
# Initializes the CodeQL tools for scanning.
5151
- name: Initialize CodeQL

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
continue-on-error: false
3737

3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
- name: Initialize vendors
4141
shell: pwsh
4242
working-directory: scripts

.github/workflows/vendor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
pull-requests: write
2525

2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
with:
2929
fetch-depth: 0
3030

launcher/src/CmderLauncher.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,6 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr
469469
MessageBox(NULL, _T("Unable to create the ConEmu process!"), _T("Error"), MB_OK);
470470
return;
471471
}
472-
473-
LRESULT lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL);
474-
lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)L"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL); // For Windows >= 8
475472
}
476473

477474
bool IsUserOnly(std::wstring opt)

vendor/bin/cmder_shell.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ if "%cmder_init%" == "1" (
99
)
1010

1111
pushd "%CMDER_ROOT%"
12-
call "%CMDER_ROOT%\vendor\init.bat" /f
12+
call "%CMDER_ROOT%\vendor\init.bat" /f %*
1313
popd

vendor/sources.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[
22
{
33
"name": "git-for-windows",
4-
"version": "2.41.0.windows.3",
5-
"url": "https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/PortableGit-2.41.0.3-64-bit.7z.exe"
4+
"version": "2.43.0-rc0.windows.1",
5+
"url": "https://github.com/git-for-windows/git/releases/download/v2.43.0-rc0.windows.1/PortableGit-2.43.0-rc0-64-bit.7z.exe"
66
},
77
{
88
"name": "clink",
9-
"version": "1.5.1",
10-
"url": "https://github.com/chrisant996/clink/releases/download/v1.5.1/clink.1.5.1.1e9e51.zip"
9+
"version": "1.5.12",
10+
"url": "https://github.com/chrisant996/clink/releases/download/v1.5.12/clink.1.5.12.c7156f.zip"
1111
},
1212
{
1313
"name": "conemu-maximus5",
@@ -16,7 +16,7 @@
1616
},
1717
{
1818
"name": "clink-completions",
19-
"version": "0.4.10",
20-
"url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.10.zip"
19+
"version": "0.4.11",
20+
"url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.11.zip"
2121
}
2222
]

0 commit comments

Comments
 (0)