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

Imports and enables Asciidoc lexer from Lexilla 5.1.4 #3097

Merged
merged 1 commit into from
Feb 12, 2022

Conversation

ancebfer
Copy link
Contributor

Replaces #2986.

data/filedefs/filetypes.asciidoc Outdated Show resolved Hide resolved
data/filedefs/filetypes.asciidoc Show resolved Hide resolved
scintilla/lexilla/include/LexicalStyles.iface Outdated Show resolved Hide resolved
@kugel-
Copy link
Member

kugel- commented Feb 11, 2022

Great, would you mind rebasing your branch for a cleaner commit history? I'd probably merge this then shortly after.

@ancebfer ancebfer force-pushed the 1.39.1 branch 2 times, most recently from e6722d5 to 8dea779 Compare February 11, 2022 16:02
@ancebfer
Copy link
Contributor Author

Branch rebased and all commits squashed into one.

@kugel-
Copy link
Member

kugel- commented Feb 11, 2022

Changed my mind, deleting LexicalStyles.iface doesnt really fit in this PR. I will deal with that separately.

@ancebfer
Copy link
Contributor Author

ancebfer commented Feb 12, 2022

Removed delete of "LexicalStyles.iface" file from commit and aligned Asciidoc scheme to Markdown scheme.
As you suggested, I will use my own VScode scheme in my personal computer.

@kugel- kugel- self-assigned this Feb 12, 2022
@ancebfer
Copy link
Contributor Author

Removed unused "strikeout", "hrule" and "codebk" from "filetypes.asciidoc" file.

Copy link
Member

@kugel- kugel- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks a lot!

@kugel- kugel- merged commit a3031e9 into geany:master Feb 12, 2022
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.

3 participants