Branch: refs/heads/master Author: Thomas Martitz kugel@rockbox.org Committer: Thomas Martitz kugel@rockbox.org Date: Mon, 11 Oct 2021 11:10:52 UTC Commit: 7d4815cd72f13836be08550fcf313994f0072b51 https://github.com/geany/geany/commit/7d4815cd72f13836be08550fcf313994f0072b...

Log Message: ----------- Install SciLexer.h that got lost during the lexilla transition

Also update some place where its old path was mentioned.

Modified Paths: -------------- scintilla/Makefile.am scripts/update-scintilla.sh src/highlighting.c

Modified: scintilla/Makefile.am 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -8,7 +8,8 @@ scintilla_include_HEADERS = \ include/Scintilla.h \ include/Scintilla.iface \ include/ScintillaWidget.h \ -include/Sci_Position.h +include/Sci_Position.h \ +lexilla/include/SciLexer.h

LEXER_SRCS = \ lexilla/lexers/LexAbaqus.cxx \

Modified: scripts/update-scintilla.sh 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -107,9 +107,9 @@ fi if ! git diff --quiet scintilla/lexilla/include/SciLexer.h; then cat << EOF

-Check the diff of scintilla/include/SciLexer.h to see whether and which +Check the diff of scintilla/lexilla/include/SciLexer.h to see whether and which mapping to add or update in src/highlightingmappings.h -(use git diff scintilla/include/SciLexer.h). +(use git diff scintilla/lexilla/include/SciLexer.h). Don't forget to also update the comment and string styles in src/highlighting.c. EOF

Modified: src/highlighting.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1168,7 +1168,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) * (e.g. by by opening a file of this type), it will be initialised. The returned pointer is * owned by Geany and must not be freed. * @param ft_id Filetype ID, e.g. @c GEANY_FILETYPES_DIFF. - * @param style_id A Scintilla lexer style, e.g. @c SCE_DIFF_ADDED. See scintilla/include/SciLexer.h. + * @param style_id A Scintilla lexer style, e.g. @c SCE_DIFF_ADDED. See scintilla/lexilla/include/SciLexer.h. * @return A pointer to the style struct. * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with scintilla_send_message(). */ GEANY_API_SYMBOL

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).