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 nano's syntax coloring #605

Merged
merged 4 commits into from
Mar 5, 2025
Merged

Fix nano's syntax coloring #605

merged 4 commits into from
Mar 5, 2025

Conversation

dscho
Copy link
Member

@dscho dscho commented Mar 5, 2025

A change in nano v8.2 rendered Git for Windows' logic to enable syntax coloring in nano non-functional. Let's fix this, along with a couple other minor things I found on the way.

This fixes git-for-windows/git#5462

dscho added 4 commits March 5, 2025 15:58
No need to startle the reader if that directory is not found; That's
okay.

Signed-off-by: Johannes Schindelin <[email protected]>
As of
[v8.2~7](https://git.savannah.gnu.org/cgit/nano.git/commit/doc/sample.nanorc.in?id=ebddb49041c7),
the commented-out `include *.nanorc` directives in `/etc/nanorc` no
longer enclose their arguments in double-quotes.

Let's adjust the post-install script that wants to uncomment those
directives.

This fixes git-for-windows/git#5462.

Signed-off-by: Johannes Schindelin <[email protected]>
When determining the current package version, we already ignore changes
to the `pkgver` line in `PKGBUILD`, which is auto-generated by the
`pkgver()` function of `PKGBUILD`.

Let's do the same for the auto-generated changes to `git-extra.install`,
which is generated from `gitconfig`, `gitattributes` and
`git-extra.install.in`.

Signed-off-by: Johannes Schindelin <[email protected]>
The `makepkg-mingw` build updated the version and `git-extra.install`.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho requested review from mjcheetham and rimrul March 5, 2025 16:23
@dscho dscho self-assigned this Mar 5, 2025
@dscho
Copy link
Member Author

dscho commented Mar 5, 2025

/deploy git-extra

The i686/x86_64 and the arm64 workflow runs were started.

@dscho
Copy link
Member Author

dscho commented Mar 5, 2025

/add relnote bug The syntax highlighting of the nano editor was recently disabled in Git for Windows by mistake, which was fixed.

The workflow run was started

github-actions bot pushed a commit that referenced this pull request Mar 5, 2025
The [syntax highlighting of the `nano` editor was recently
disabled](git-for-windows/git#5462) in Git for
Windows by mistake, which [was
fixed](#605).

Signed-off-by: gitforwindowshelper[bot] <[email protected]>
@dscho dscho merged commit 9953c6c into main Mar 5, 2025
8 checks passed
@dscho dscho deleted the fix-nano-syntax-coloring branch March 5, 2025 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Highlighting in nano broken after v2.45.2
1 participant