Commits March 2023

commits@lists.geany.org

1 participants
39 discussions

[geany/geany] b51d35: Place # at the beginning of the line with the example in filetype conf files
by Jiří Techet 12 Mar '23

12 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 12 Mar 2023 21:58:16 UTC Commit: b51d35bbc6252aaab9da7ca0fb2dcf52931ec1df https://github.com/geany/geany/commit/b51d35bbc6252aaab9da7ca0fb2dcf52931ec… Log Message: ----------- Place # at the beginning of the line with the example in filetype conf files The previous syntax with indented # was an invalid conf file syntax and Scintilla didn't highlight these lines correctly. Modified Paths: -------------- data/filedefs/filetypes.Arduino.conf data/filedefs/filetypes.CUDA.conf data/filedefs/filetypes.Clojure.conf data/filedefs/filetypes.Graphviz.conf data/filedefs/filetypes.TypeScript.conf data/filedefs/filetypes.abaqus data/filedefs/filetypes.actionscript data/filedefs/filetypes.ada data/filedefs/filetypes.asm data/filedefs/filetypes.batch data/filedefs/filetypes.c data/filedefs/filetypes.caml data/filedefs/filetypes.cmake data/filedefs/filetypes.cobol data/filedefs/filetypes.conf data/filedefs/filetypes.cpp data/filedefs/filetypes.cs data/filedefs/filetypes.css data/filedefs/filetypes.d data/filedefs/filetypes.docbook data/filedefs/filetypes.erlang data/filedefs/filetypes.f77 data/filedefs/filetypes.forth data/filedefs/filetypes.fortran data/filedefs/filetypes.freebasic data/filedefs/filetypes.gdscript data/filedefs/filetypes.glsl data/filedefs/filetypes.go data/filedefs/filetypes.haskell data/filedefs/filetypes.haxe data/filedefs/filetypes.html data/filedefs/filetypes.java data/filedefs/filetypes.javascript data/filedefs/filetypes.latex data/filedefs/filetypes.lisp data/filedefs/filetypes.lua data/filedefs/filetypes.makefile data/filedefs/filetypes.matlab data/filedefs/filetypes.nsis data/filedefs/filetypes.objectivec data/filedefs/filetypes.pascal data/filedefs/filetypes.perl data/filedefs/filetypes.php data/filedefs/filetypes.po data/filedefs/filetypes.powershell data/filedefs/filetypes.python.in data/filedefs/filetypes.r data/filedefs/filetypes.restructuredtext data/filedefs/filetypes.ruby data/filedefs/filetypes.rust data/filedefs/filetypes.sh data/filedefs/filetypes.smalltalk data/filedefs/filetypes.sql data/filedefs/filetypes.tcl data/filedefs/filetypes.vala data/filedefs/filetypes.verilog data/filedefs/filetypes.vhdl data/filedefs/filetypes.xml data/filedefs/filetypes.yaml Modified: data/filedefs/filetypes.Arduino.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -22,9 +22,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true # context action command (please see Geany's main documentation for details) Modified: data/filedefs/filetypes.CUDA.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,9 +31,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.Clojure.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -22,9 +22,9 @@ comment_single=; # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.Graphviz.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,9 +31,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.TypeScript.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,9 +31,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.abaqus 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -30,9 +30,9 @@ comment_single=** # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=false Modified: data/filedefs/filetypes.actionscript 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,9 +27,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.ada 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -37,9 +37,9 @@ comment_single=-- # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.asm 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -41,9 +41,9 @@ comment_single=; # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.batch 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -30,9 +30,9 @@ comment_single=REM\s # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -60,9 +60,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.caml 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -42,9 +42,9 @@ comment_close=*) # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.cmake 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -42,9 +42,9 @@ comment_single=# # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.cobol 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -36,9 +36,9 @@ comment_single=*> # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=false Modified: data/filedefs/filetypes.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,9 +28,9 @@ comment_single=# # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.cpp 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -30,9 +30,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.cs 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,9 +31,9 @@ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.css 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -57,9 +57,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.d 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -52,9 +52,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.docbook 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -59,9 +59,9 @@ comment_close=--> # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.erlang 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -59,9 +59,9 @@ comment_single=% # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.f77 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -42,9 +42,9 @@ primary=access action advance allocatable allocate apostrophe assign assignment # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=false Modified: data/filedefs/filetypes.forth 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -41,9 +41,9 @@ comment_close= ) # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.fortran 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -26,9 +26,9 @@ comment_single=! # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=false Modified: data/filedefs/filetypes.freebasic 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -48,9 +48,9 @@ comment_close='/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.gdscript 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -42,9 +42,9 @@ comment_single=#\s # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.glsl 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,9 +27,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.go 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -34,9 +34,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.haskell 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -58,9 +58,9 @@ comment_close=-} # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.haxe 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,9 +27,9 @@ comment_single=// # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.html 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -111,9 +111,9 @@ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.java 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,9 +28,9 @@ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.javascript 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,9 +28,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.latex 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -39,9 +39,9 @@ comment_single=% # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.lisp 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -34,9 +34,9 @@ comment_close=|# # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.lua 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -56,9 +56,9 @@ comment_close=--]] # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.makefile 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,9 +27,9 @@ comment_single=# # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=false Modified: data/filedefs/filetypes.matlab 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -33,9 +33,9 @@ comment_single=% # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.nsis 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -47,9 +47,9 @@ comment_single=; # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.objectivec 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -29,9 +29,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.pascal 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -44,9 +44,9 @@ comment_close=} # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.perl 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -75,9 +75,9 @@ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.php 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -25,9 +25,9 @@ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -36,9 +36,9 @@ comment_single=# # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.powershell 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -43,9 +43,9 @@ comment_close=#> # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.python.in 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -53,9 +53,9 @@ comment_single=#\s # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.r 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -38,9 +38,9 @@ comment_single=# # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=false Modified: data/filedefs/filetypes.restructuredtext 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -20,9 +20,9 @@ comment_single=..\s # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments #comment_use_indent=true Modified: data/filedefs/filetypes.ruby 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -59,9 +59,9 @@ comment_single=# # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.rust 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -48,9 +48,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.sh 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -36,11 +36,11 @@ comment_single=# #comment_open= #comment_close= -# set to false if a comment character/string should start a column 0 of a line, true uses any +# set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.smalltalk 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -41,9 +41,9 @@ comment_close=" # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.sql 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -43,9 +43,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.tcl 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -47,9 +47,9 @@ comment_single=# # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.vala 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,9 +31,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments #comment_use_indent=true Modified: data/filedefs/filetypes.verilog 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -46,9 +46,9 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.vhdl 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -46,9 +46,9 @@ comment_single=-- # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.xml 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -21,9 +21,9 @@ comment_close=--> # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true Modified: data/filedefs/filetypes.yaml 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -35,9 +35,9 @@ comment_single=# # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d - #command_example(); +# #command_example(); # setting to false would generate this -# command_example(); +# # command_example(); # This setting works only for single line comments comment_use_indent=true -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 39d1e7: Recognize .F77 extension (uppercase) as FORTRAN77
by Colomban Wendling 09 Mar '23

09 Mar '23

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 09 Mar 2023 21:39:10 UTC Commit: 39d1e7f53a2b77cb0527f8368a49164b7ae6372f https://github.com/geany/geany/commit/39d1e7f53a2b77cb0527f8368a49164b7ae63… Log Message: ----------- Recognize .F77 extension (uppercase) as FORTRAN77 Fixes #3425. Modified Paths: -------------- data/filetype_extensions.conf Modified: data/filetype_extensions.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -27,7 +27,7 @@ D=*.d;*.di; Diff=*.diff;*.patch;*.rej; Docbook=*.docbook; Erlang=*.erl;*.hrl; -F77=*.f;*.for;*.ftn;*.f77;*.F;*.FOR;*.FTN;*.fpp;*.FPP; +F77=*.f;*.for;*.ftn;*.f77;*.F;*.FOR;*.FTN;*.fpp;*.FPP;*.F77; Forth=*.fs;*.fth; Fortran=*.f90;*.f95;*.f03;*.f08;*.F90;*.F95;*.F03;*.F08; FreeBasic=*.bas;*.bi;*.vbs; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8a9e9b: Add filetype submenus for new file with template menus (#3397)
by Nick Treleaven 09 Mar '23

09 Mar '23

Branch: refs/heads/master Author: Nick Treleaven <ntrel002(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Thu, 09 Mar 2023 16:24:37 UTC Commit: 8a9e9be88545f83c91d378d6662790efa38959d4 https://github.com/geany/geany/commit/8a9e9be88545f83c91d378d6662790efa3895… Log Message: ----------- Add filetype submenus for new file with template menus (#3397) * Put items with submenus at the top of the menu * Add filetype submenus for new file template menus Add submenus when there's more than one template per filetype. * Remove redundant checks for null ft * Update docs Modified Paths: -------------- doc/geany.txt src/filetypes.c src/templates.c src/ui_utils.c src/ui_utils.h Modified: doc/geany.txt 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -4944,7 +4944,8 @@ File templates File templates are templates used as the basis of a new file. To use them, choose the *New (with Template)* menu item from the *File* -menu. +menu. If there is more than one template for a filetype then they +will be grouped in a submenu. By default, file templates are installed for some filetypes. Custom file templates can be added by creating the appropriate template file. You can Modified: src/filetypes.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -513,7 +513,8 @@ static GeanyFiletype *detect_filetype_conf_file(const gchar *utf8_filename) /* Detect filetype only based on the filename extension. - * utf8_filename can include the full path. */ + * utf8_filename can include the full path. + * Returns: non-NULL */ GeanyFiletype *filetypes_detect_from_extension(const gchar *utf8_filename) { gchar *base_filename; Modified: src/templates.c 37 lines changed, 36 insertions(+), 1 deletions(-) =================================================================== @@ -255,19 +255,54 @@ static void add_file_item(const gchar *fname, GtkWidget *menu) } +typedef struct +{ + gint count; + GtkWidget *menu; +} +FTMenu; + static void populate_file_template_menu(GtkWidget *menu) { GSList *list = utils_get_config_files(GEANY_TEMPLATES_SUBDIR G_DIR_SEPARATOR_S "files"); GSList *node; + FTMenu *ft_groups; + gint nbytes = sizeof(FTMenu) * filetypes_array->len; + + ft_groups = g_alloca(nbytes); + memset(ft_groups, 0, nbytes); + + foreach_slist(node, list) + { + gchar *fname = node->data; + GeanyFiletype *ft = filetypes_detect_from_extension(fname); + ft_groups[ft->id].count++; + } foreach_slist(node, list) { gchar *fname = node->data; + GeanyFiletype *ft = filetypes_detect_from_extension(fname); + FTMenu *group = &ft_groups[ft->id]; - add_file_item(fname, menu); + if (group->count == 1) + add_file_item(fname, menu); + else + { + if (!group->menu) + { + GtkWidget *item = gtk_menu_item_new_with_label(ft->name); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + group->menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), group->menu); + } + add_file_item(fname, group->menu); + } g_free(fname); } g_slist_free(list); + ui_menu_sort_by_label(GTK_MENU(menu)); } Modified: src/ui_utils.c 9 lines changed, 4 insertions(+), 5 deletions(-) =================================================================== @@ -118,7 +118,6 @@ static void recent_file_loaded(const gchar *utf8_filename, GeanyRecentFiles *grf static void recent_file_activate_cb(GtkMenuItem *menuitem, gpointer user_data); static void recent_project_activate_cb(GtkMenuItem *menuitem, gpointer user_data); static GtkWidget *progress_bar_create(void); -static void ui_menu_sort_by_label(GtkMenu *menu); /* simple wrapper for gtk_widget_set_sensitive() to allow widget being NULL */ @@ -2877,11 +2876,11 @@ static gint compare_menu_item_labels(gconstpointer a, gconstpointer b) gchar *sa, *sb; gint result; - /* put entries with submenus at the end of the menu */ + /* put entries with submenus at the start of the menu */ if (gtk_menu_item_get_submenu(item_a) && !gtk_menu_item_get_submenu(item_b)) - return 1; - else if (!gtk_menu_item_get_submenu(item_a) && gtk_menu_item_get_submenu(item_b)) return -1; + else if (!gtk_menu_item_get_submenu(item_a) && gtk_menu_item_get_submenu(item_b)) + return 1; sa = ui_menu_item_get_text(item_a); sb = ui_menu_item_get_text(item_b); @@ -2893,7 +2892,7 @@ static gint compare_menu_item_labels(gconstpointer a, gconstpointer b) /* Currently @a menu should contain only GtkMenuItems with labels. */ -static void ui_menu_sort_by_label(GtkMenu *menu) +void ui_menu_sort_by_label(GtkMenu *menu) { GList *list = gtk_container_get_children(GTK_CONTAINER(menu)); GList *node; Modified: src/ui_utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -371,6 +371,8 @@ gboolean ui_encodings_combo_box_set_active_encoding(GtkComboBox *combo, gint enc gchar *ui_get_project_directory(const gchar *path); +void ui_menu_sort_by_label(GtkMenu *menu); + void ui_menu_popup(GtkMenu* menu, GtkMenuPositionFunc func, gpointer data, guint button, guint32 activate_time); #endif /* GEANY_PRIVATE */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 4e9bde: Describe workaround of bash being killed by macOS 13
by Jiří Techet 07 Mar '23

07 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 07 Mar 2023 20:38:18 UTC Commit: 4e9bde9fc7ff39a857147b674053a93531ec10ee https://github.com/geany/geany-osx/commit/4e9bde9fc7ff39a857147b674053a9353… Log Message: ----------- Describe workaround of bash being killed by macOS 13 Modified Paths: -------------- README.md Modified: README.md 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -115,6 +115,12 @@ To create the bundle, you need to first install JHBuild and GTK as described bel when building on ARM processors - it isn't possible to compile ARM binaries on Intel processors. +5. To workaround the current problem in gtk-osx of `bash` being killed + by macOS 13, run: + ``` + rm -f ~/.new_local/bin/bash && ln -s /bin/bash ~/.new_local/bin/ + ``` + 6. Install GTK and all of its dependencies by running the following command inside the `geany-osx` directory: ``` -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9b3aa4: Map asciidoc level 5 section so it can be shown in the sidebar
by Jiří Techet 07 Mar '23

07 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 24 Feb 2023 12:50:28 UTC Commit: 9b3aa43f8c6d10ccc6f4f405bb7065da86f93daf https://github.com/geany/geany/commit/9b3aa43f8c6d10ccc6f4f405bb7065da86f93… Log Message: ----------- Map asciidoc level 5 section so it can be shown in the sidebar Fixes #3411. Modified Paths: -------------- src/tagmanager/tm_parser.c tests/ctags/simple.asciidoc.tags Modified: src/tagmanager/tm_parser.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -834,7 +834,7 @@ static TMParserMapEntry map_ASCIIDOC[] = { {'S', tm_tag_macro_t}, //subsection {'t', tm_tag_variable_t}, //subsubsection {'T', tm_tag_struct_t}, //l4subsection - {'u', tm_tag_undef_t}, //l5subsection + {'u', tm_tag_enumerator_t}, //l5subsection {'a', tm_tag_undef_t}, //anchor }; static TMParserMapGroup group_ASCIIDOC[] = { @@ -843,6 +843,7 @@ static TMParserMapGroup group_ASCIIDOC[] = { {N_("Section Level 2"), TM_ICON_NONE, tm_tag_macro_t}, {N_("Section Level 3"), TM_ICON_NONE, tm_tag_variable_t}, {N_("Section Level 4"), TM_ICON_NONE, tm_tag_struct_t}, + {N_("Section Level 5"), TM_ICON_NONE, tm_tag_enumerator_t}, }; // no scope information Modified: tests/ctags/simple.asciidoc.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -10,6 +10,8 @@ Level 4 Section 1.1.1.1.1 Title struct: Level 3 Section 1.1.1.1 Title :: Level 4 Section 1.1.1.1.1 Title Level 4 Section 2.1.1.1.1 Title�2048�Level 3 Section 2.1.1.1 Title�0 struct: Level 3 Section 2.1.1.1 Title :: Level 4 Section 2.1.1.1.1 Title +Level 5 Section 1.1.1.1.1.1 Title�4�Level 4 Section 1.1.1.1.1 Title�0 +enumerator: Level 4 Section 1.1.1.1.1 Title :: Level 5 Section 1.1.1.1.1.1 Title Section 1.1�64�Chapter 1 (Level 0)�0 member: Chapter 1 (Level 0) :: Section 1.1 Section 1.2�64�Chapter 1 (Level 0)�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] afec65: Merge pull request #3412 from techee/asciidoc_lvl5
by Jiří Techet 07 Mar '23

07 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Tue, 07 Mar 2023 08:58:22 UTC Commit: afec6557e0f453a38b2976069de3763b8e1d09d1 https://github.com/geany/geany/commit/afec6557e0f453a38b2976069de3763b8e1d0… Log Message: ----------- Merge pull request #3412 from techee/asciidoc_lvl5 Map asciidoc level 5 section so it can be shown in the sidebar Modified Paths: -------------- src/tagmanager/tm_parser.c tests/ctags/simple.asciidoc.tags Modified: src/tagmanager/tm_parser.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -834,7 +834,7 @@ static TMParserMapEntry map_ASCIIDOC[] = { {'S', tm_tag_macro_t}, //subsection {'t', tm_tag_variable_t}, //subsubsection {'T', tm_tag_struct_t}, //l4subsection - {'u', tm_tag_undef_t}, //l5subsection + {'u', tm_tag_enumerator_t}, //l5subsection {'a', tm_tag_undef_t}, //anchor }; static TMParserMapGroup group_ASCIIDOC[] = { @@ -843,6 +843,7 @@ static TMParserMapGroup group_ASCIIDOC[] = { {N_("Section Level 2"), TM_ICON_NONE, tm_tag_macro_t}, {N_("Section Level 3"), TM_ICON_NONE, tm_tag_variable_t}, {N_("Section Level 4"), TM_ICON_NONE, tm_tag_struct_t}, + {N_("Section Level 5"), TM_ICON_NONE, tm_tag_enumerator_t}, }; // no scope information Modified: tests/ctags/simple.asciidoc.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -10,6 +10,8 @@ Level 4 Section 1.1.1.1.1 Title struct: Level 3 Section 1.1.1.1 Title :: Level 4 Section 1.1.1.1.1 Title Level 4 Section 2.1.1.1.1 Title�2048�Level 3 Section 2.1.1.1 Title�0 struct: Level 3 Section 2.1.1.1 Title :: Level 4 Section 2.1.1.1.1 Title +Level 5 Section 1.1.1.1.1.1 Title�4�Level 4 Section 1.1.1.1.1 Title�0 +enumerator: Level 4 Section 1.1.1.1.1 Title :: Level 5 Section 1.1.1.1.1.1 Title Section 1.1�64�Chapter 1 (Level 0)�0 member: Chapter 1 (Level 0) :: Section 1.1 Section 1.2�64�Chapter 1 (Level 0)�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 6640f0: Fix incorrectly renamed identifier in glade file
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 22:59:07 UTC Commit: 6640f059a59a348c89bece8cddd84a05bce8f4d9 https://github.com/geany/geany-osx/commit/6640f059a59a348c89bece8cddd84a05b… Log Message: ----------- Fix incorrectly renamed identifier in glade file Modified Paths: -------------- geany_patches/01git-geany_config_shell.patch Modified: geany_patches/01git-geany_config_shell.patch 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -66,7 +66,7 @@ index 3864a0ad1..79cf7c4b9 100644 + <property name="can-focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Shell:</property> -+ <property name="mnemonic-widget">entry-grep</property> ++ <property name="mnemonic-widget">entry_grep</property> + </object> + <packing> + <property name="top-attach">3</property> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 294c52: Avoid duplicate image id in glade file
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 22:56:11 UTC Commit: 294c52d72e026732d41b3d94e66018027fa41a84 https://github.com/geany/geany-osx/commit/294c52d72e026732d41b3d94e66018027… Log Message: ----------- Avoid duplicate image id in glade file Modified Paths: -------------- geany_patches/01git-geany_config_shell.patch Modified: geany_patches/01git-geany_config_shell.patch 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -101,7 +101,7 @@ index 3864a0ad1..79cf7c4b9 100644 + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <child> -+ <object class="GtkImage" id="image7"> ++ <object class="GtkImage" id="image777X"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="stock">gtk-open</property> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] e3544d: Modify modules to download geany and geany-plugins master instead of cloning git
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 22:51:50 UTC Commit: e3544dc11e2bc78e5ada5efd772f08b2eb696a25 https://github.com/geany/geany-osx/commit/e3544dc11e2bc78e5ada5efd772f08b2e… Log Message: ----------- Modify modules to download geany and geany-plugins master instead of cloning git When cloned, the provided patches aren't applied Modified Paths: -------------- geany.modules Modified: geany.modules 24 lines changed, 13 insertions(+), 11 deletions(-) =================================================================== @@ -4,8 +4,6 @@ <moduleset> <repository type="tarball" name="ftp.gnome.org" href="https://ftp.gnome.org/pub/GNOME/sources/"/> - <repository type="git" name="github.com" - href="https://github.com/"/> <repository type="git" name="gitlab.gnome.org" href="https://gitlab.gnome.org/GNOME/"/> <repository type="tarball" name="download.gitlab.gnome.org" @@ -89,7 +87,9 @@ supports-non-srcdir-builds="no" makeargs="install">  <branch repo="gitlab.gnome.org" - module="gtk-mac-bundler"/> + module="gtk-mac-bundler"> +  + </branch> </autotools> <metamodule id="geany-deps"> @@ -104,12 +104,13 @@ </dependencies> </metamodule> -  +  <meson id="geany-git" mesonargs="-Dmac-integration=enabled"> - <branch repo="github.com" - module="geany/geany.git" + <branch repo="download.github.com" + module="geany/geany/archive/refs/heads/master.tar.gz" + rename-tarball="geany-git.tar.gz" checkoutdir="geany-git" - revision="master" > + version="master" >  <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01git-geany_con…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/02-geany_scinti…" strip="1" /> @@ -151,13 +152,14 @@ </dependencies> </metamodule> -  +  <autotools id="geany-plugins-git" supports-non-srcdir-builds="no"> - <branch repo="github.com" - module="geany/geany-plugins.git" + <branch repo="download.github.com" + module="geany/geany-plugins/archive/refs/heads/master.tar.gz" + rename-tarball="geany-plugins-git.tar.gz" checkoutdir="geany-plugins-git" - revision="master"> + version="master" > <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01-geany_plugin…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/06-geany-plugin…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/07-geany_plugin…" strip="1" /> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 5eeafd: Workaround meson expecting git repository presence
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 22:27:15 UTC Commit: 5eeafdb949b462c08d1f4f2754b5b373857d6476 https://github.com/geany/geany-osx/commit/5eeafdb949b462c08d1f4f2754b5b3738… Log Message: ----------- Workaround meson expecting git repository presence Modified Paths: -------------- geany.modules geany_patches/04-geany_workaround_meson_expecting_git_repository.patch Modified: geany.modules 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -114,6 +114,7 @@ <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01git-geany_con…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/02-geany_scinti…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/03git-geany_vte…" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/04-geany_workar…" strip="1" /> </branch> <dependencies> <dep package="geany-deps" /> Modified: geany_patches/04-geany_workaround_meson_expecting_git_repository.patch 31 lines changed, 31 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,31 @@ +From e2e19c1519dd10f9c64dbcb42cb42fe2326887a1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> +Date: Mon, 6 Mar 2023 23:22:12 +0100 +Subject: [PATCH] Workaround meson expecting git repository presence + +--- + meson.build | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index 6944a423b..7b6213870 100644 +--- a/meson.build ++++ b/meson.build +@@ -165,13 +165,7 @@ python = pymod.find_installation('python3', modules: doxygen.found() and get_opt + # These two are truly optional + rst2html = find_program('rst2html', required: get_option('html-docs')) + rst2pdf = find_program('rst2pdf', required: get_option('pdf-docs')) +-git = find_program('git', required: false) +-if git.found() +- ret = run_command(git, 'rev-parse', '--short', '--revs-only', 'HEAD', check: true) +- cdata.set_quoted('REVISION', ret.stdout().strip()) +-else +- cdata.set_quoted('REVISION', '-1') +-endif ++cdata.set_quoted('REVISION', '-1') + + python_command = get_option('python-command') + if python_command == '' or python_command == 'auto' +-- +2.37.5 + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2023