Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: GitHub <noreply(a)github.com>
Date: Mon, 14 Oct 2024 16:54:06 UTC
Commit: 78f1f3f516f14ac7f6088fe07c77fc3842497d8f
https://github.com/geany/geany/commit/78f1f3f516f14ac7f6088fe07c77fc3842497…
Log Message:
-----------
Merge pull request #3991 from techee/hacking_patch
Update HACKING to better describe what has to be changed in scintilla_changes.patch
Modified Paths:
--------------
HACKING
Modified: HACKING
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -585,8 +585,9 @@ LexFoo.cxx. Try the official Scintilla project first.
When adding a lexer:
* add LexFoo.cxx to scintilla/lexilla/lexers
-* add `&lmFoo` to scintilla/lexilla/src/Lexilla.cxx and
- scintilla/scintilla_changes.patch
+* add ``&lmFoo`` to scintilla/lexilla/src/Lexilla.cxx
+* update scintilla/scintilla_changes.patch to contain ``+ &lmFoo,`` and
+ increment ``s`` in the hunk header ``@@ -R,r +S,s @@`` above the added line
* update scintilla/Makefile.am and meson.build
For syntax highlighting, you will need to edit highlighting.c and
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 07 Oct 2024 20:50:50 UTC
Commit: e75602bf8eb4527cd2849c6df6c79929f9cae633
https://github.com/geany/geany/commit/e75602bf8eb4527cd2849c6df6c79929f9cae…
Log Message:
-----------
Fix Scintilla update script
scintilla/README is not a directory, so the test wouldn't ever pass.
Also fix updating Lexilla lexers if the current directory contains a
.cxx file, which would then match the unescaped `*.cxx` pattern.
Modified Paths:
--------------
scripts/update-scintilla.sh
Modified: scripts/update-scintilla.sh
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -44,7 +44,7 @@ copy_to()
dest="$1"
shift
- if ! [ -d "$dest" ]; then
+ if ! [ -e "$dest" ]; then
echo "$dest does not exist." >&2;
exit 1
fi
@@ -74,7 +74,7 @@ copy_to scintilla/lexilla/lexlib "$LEX_SRC"/lexlib/*.h
copy_to scintilla/lexilla/ "$LEX_SRC"/License.txt
copy_to scintilla/lexilla/ "$LEX_SRC"/version.txt
# now copy the lexers we use
-git -C scintilla/lexilla/lexers/ ls-files *.cxx | while read f; do
+git -C scintilla/lexilla/lexers/ ls-files '*.cxx' | while read f; do
copy_to "scintilla/lexilla/lexers" "$LEX_SRC/lexers/$f"
done
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Thomas Martitz <t.martitz(a)avm.de>
Committer: Thomas Martitz <t.martitz(a)avm.de>
Date: Wed, 02 Oct 2024 05:52:04 UTC
Commit: e050481355ee44ea49f263ff356f52d0daabe8d1
https://github.com/geany/geany/commit/e050481355ee44ea49f263ff356f52d0daabe…
Log Message:
-----------
Rename enum member to workaround GI issue
GI synthesizes an enum type "TMTagAttrType" with the members none_t,
name_t and so on (common prefix "tm_tag_attr_" removed). In that context,
tm_tag_attr_time_ aka. time_t clashes with the global time_t type.
Since the member is unused so far simply rename it as an easy way out.
Modified Paths:
--------------
src/tagmanager/tm_tag.h
Modified: src/tagmanager/tm_tag.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -59,7 +59,7 @@ typedef enum
tm_tag_attr_inheritance_t = 64, /**< Parent classes */
tm_tag_attr_arglist_t = 128, /**< Argument list */
tm_tag_attr_local_t = 256, /**< If it has local scope */
- tm_tag_attr_time_t = 512, /**< Modification time (File tag only) */
+ tm_tag_attr_mtime_t = 512, /**< Modification time (File tag only) */
tm_tag_attr_vartype_t = 1024, /**< Variable Type */
tm_tag_attr_access_t = 2048, /**< Access type (public/protected/private) */
tm_tag_attr_impl_t = 4096, /**< Implementation (e.g. virtual) */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).