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.

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

Fix colemak patch #1744

Merged
merged 1 commit into from
Oct 8, 2023
Merged

Fix colemak patch #1744

merged 1 commit into from
Oct 8, 2023

Conversation

s-hamann
Copy link
Contributor

@s-hamann s-hamann commented Oct 8, 2023

At Gentoo (gentoo/gentoo#32472), we found that the Colemak and Colemak-DH patches do not apply cleanly on the latest 4.9 release nor on master:

$ make O_COLEMAK=1
patching file src/nnn.c
Hunk #1 FAILED at 5098.
1 out of 1 hunk FAILED -- saving rejects to file src/nnn.c.rej
patching file src/nnn.h
Hunk #1 succeeded at 138 (offset 1 line).
Hunk #2 succeeded at 156 (offset 1 line).
Hunk #3 succeeded at 201 (offset 2 lines).
Hunk #4 succeeded at 228 (offset 2 lines).
Hunk #5 succeeded at 245 (offset 2 lines).
Hunk #6 succeeded at 257 (offset 2 lines).
make[1]: *** [Makefile:343: prepatch] Error 1
make: *** [Makefile:211: nnn] Error 2

Strangely, the check-patches.sh script does not detect this and claims success for all patches/patch combinations. I did not investigate that, though.

This PR fixes the Colemak patch to apply to master.

s-hamann added a commit to s-hamann/gentoo that referenced this pull request Oct 8, 2023
See jarun/nnn#1744

Signed-off-by: Sebastian Hamann <code@ares-macrotechnology.com>
@jarun jarun merged commit 7f63bef into jarun:master Oct 8, 2023
7 checks passed
@N-R-K
Copy link
Collaborator

N-R-K commented Oct 8, 2023

Strangely, the check-patches.sh script does not detect this and claims success for all patches/patch combinations.

That's alarming. I'll have a look into that when I'm free.

@github-actions github-actions bot locked and limited conversation to collaborators Nov 8, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants