[geany/geany-plugins] 9a09b7: Merge pull request #60 from b4n/fixes/various
Frank Lanitz
git-noreply at xxxxx
Fri Jul 20 21:10:04 UTC 2012
Branch: refs/heads/master
Author: Frank Lanitz <frank at frank.uvena.de>
Committer: Frank Lanitz <frank at frank.uvena.de>
Date: Fri, 20 Jul 2012 21:10:04
Commit: 9a09b7f4c2c1ad6d1d3ce1b76a4b1c824be6c77f
https://github.com/geany/geany-plugins/commit/9a09b7f4c2c1ad6d1d3ce1b76a4b1c824be6c77f
Log Message:
-----------
Merge pull request #60 from b4n/fixes/various
Version bump & fix for GeanyLua to build against 1.23
Modified Paths:
--------------
build/geany-plugins.nsi
configure.ac
geanylua/glspi_sci.h
wscript
Modified: build/geany-plugins.nsi
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -38,7 +38,7 @@ RequestExecutionLevel highest ; set execution level for Windows Vista
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_DIR_REGKEY "Software\Geany-Plugins"
!define GEANY_DIR_REGKEY "Software\Geany"
-!define REQUIRED_GEANY_VERSION "1.22"
+!define REQUIRED_GEANY_VERSION "1.23"
!define RESOURCEDIR "geany-plugins-${PRODUCT_VERSION}"
;;;;;;;;;;;;;;;;;;;;;
Modified: configure.ac
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -18,7 +18,7 @@ IT_PROG_INTLTOOL([0.35.0])
GP_I18N
dnl common checks
-GP_CHECK_GEANY(1.22)
+GP_CHECK_GEANY(1.23)
GP_CHECK_UNITTESTS(0.9.4)
GP_CHECK_CPPCHECK
GP_CHECK_CFLAGS
Modified: geanylua/glspi_sci.h
20 files changed, 18 insertions(+), 2 deletions(-)
===================================================================
@@ -38,6 +38,7 @@
{"ADDSTYLEDTEXT", SLT_VOID, SCI_ADDSTYLEDTEXT, SLT_INT, SLT_CELLS},
{"INSERTTEXT", SLT_VOID, SCI_INSERTTEXT, SLT_INT, SLT_STRING},
{"CLEARALL", SLT_VOID, SCI_CLEARALL, SLT_VOID, SLT_VOID},
+ {"DELETERANGE", SLT_VOID, SCI_DELETERANGE, SLT_INT, SLT_INT},
{"CLEARDOCUMENTSTYLE", SLT_VOID, SCI_CLEARDOCUMENTSTYLE, SLT_VOID, SLT_VOID},
{"GETLENGTH", SLT_INT, SCI_GETLENGTH, SLT_VOID, SLT_VOID},
{"GETCHARAT", SLT_INT, SCI_GETCHARAT, SLT_INT, SLT_VOID},
@@ -72,7 +73,6 @@
{"SETTABWIDTH", SLT_VOID, SCI_SETTABWIDTH, SLT_INT, SLT_VOID},
{"GETTABWIDTH", SLT_INT, SCI_GETTABWIDTH, SLT_VOID, SLT_VOID},
{"SETCODEPAGE", SLT_VOID, SCI_SETCODEPAGE, SLT_INT, SLT_VOID},
- {"SETUSEPALETTE", SLT_VOID, SCI_SETUSEPALETTE, SLT_BOOL, SLT_VOID},
{"MARKERDEFINE", SLT_VOID, SCI_MARKERDEFINE, SLT_INT, SLT_INT},
{"MARKERSETFORE", SLT_VOID, SCI_MARKERSETFORE, SLT_INT, SLT_INT},
{"MARKERSETBACK", SLT_VOID, SCI_MARKERSETBACK, SLT_INT, SLT_INT},
@@ -121,6 +121,10 @@
{"STYLEGETCHANGEABLE", SLT_BOOL, SCI_STYLEGETCHANGEABLE, SLT_INT, SLT_VOID},
{"STYLEGETHOTSPOT", SLT_BOOL, SCI_STYLEGETHOTSPOT, SLT_INT, SLT_VOID},
{"STYLESETCASE", SLT_VOID, SCI_STYLESETCASE, SLT_INT, SLT_INT},
+ {"STYLESETSIZEFRACTIONAL", SLT_VOID, SCI_STYLESETSIZEFRACTIONAL, SLT_INT, SLT_INT},
+ {"STYLEGETSIZEFRACTIONAL", SLT_INT, SCI_STYLEGETSIZEFRACTIONAL, SLT_INT, SLT_VOID},
+ {"STYLESETWEIGHT", SLT_VOID, SCI_STYLESETWEIGHT, SLT_INT, SLT_INT},
+ {"STYLEGETWEIGHT", SLT_INT, SCI_STYLEGETWEIGHT, SLT_INT, SLT_VOID},
{"STYLESETCHARACTERSET", SLT_VOID, SCI_STYLESETCHARACTERSET, SLT_INT, SLT_INT},
{"STYLESETHOTSPOT", SLT_VOID, SCI_STYLESETHOTSPOT, SLT_INT, SLT_BOOL},
{"SETSELFORE", SLT_VOID, SCI_SETSELFORE, SLT_BOOL, SLT_INT},
@@ -197,6 +201,7 @@
{"GETLINEINDENTATION", SLT_INT, SCI_GETLINEINDENTATION, SLT_INT, SLT_VOID},
{"GETLINEINDENTPOSITION", SLT_INT, SCI_GETLINEINDENTPOSITION, SLT_INT, SLT_VOID},
{"GETCOLUMN", SLT_INT, SCI_GETCOLUMN, SLT_INT, SLT_VOID},
+ {"COUNTCHARACTERS", SLT_INT, SCI_COUNTCHARACTERS, SLT_INT, SLT_INT},
{"SETHSCROLLBAR", SLT_VOID, SCI_SETHSCROLLBAR, SLT_BOOL, SLT_VOID},
{"GETHSCROLLBAR", SLT_BOOL, SCI_GETHSCROLLBAR, SLT_VOID, SLT_VOID},
{"SETINDENTATIONGUIDES", SLT_VOID, SCI_SETINDENTATIONGUIDES, SLT_INT, SLT_VOID},
@@ -206,7 +211,6 @@
{"GETLINEENDPOSITION", SLT_INT, SCI_GETLINEENDPOSITION, SLT_INT, SLT_VOID},
{"GETCODEPAGE", SLT_INT, SCI_GETCODEPAGE, SLT_VOID, SLT_VOID},
{"GETCARETFORE", SLT_INT, SCI_GETCARETFORE, SLT_VOID, SLT_VOID},
- {"GETUSEPALETTE", SLT_BOOL, SCI_GETUSEPALETTE, SLT_VOID, SLT_VOID},
{"GETREADONLY", SLT_BOOL, SCI_GETREADONLY, SLT_VOID, SLT_VOID},
{"SETCURRENTPOS", SLT_VOID, SCI_SETCURRENTPOS, SLT_INT, SLT_VOID},
{"SETSELECTIONSTART", SLT_VOID, SCI_SETSELECTIONSTART, SLT_INT, SLT_VOID},
@@ -276,6 +280,7 @@
{"CALLTIPSETFORE", SLT_VOID, SCI_CALLTIPSETFORE, SLT_INT, SLT_VOID},
{"CALLTIPSETFOREHLT", SLT_VOID, SCI_CALLTIPSETFOREHLT, SLT_INT, SLT_VOID},
{"CALLTIPUSESTYLE", SLT_VOID, SCI_CALLTIPUSESTYLE, SLT_INT, SLT_VOID},
+ {"CALLTIPSETPOSITION", SLT_VOID, SCI_CALLTIPSETPOSITION, SLT_BOOL, SLT_VOID},
{"VISIBLEFROMDOCLINE", SLT_INT, SCI_VISIBLEFROMDOCLINE, SLT_INT, SLT_VOID},
{"DOCLINEFROMVISIBLE", SLT_INT, SCI_DOCLINEFROMVISIBLE, SLT_INT, SLT_VOID},
{"WRAPCOUNT", SLT_INT, SCI_WRAPCOUNT, SLT_INT, SLT_VOID},
@@ -286,6 +291,7 @@
{"SHOWLINES", SLT_VOID, SCI_SHOWLINES, SLT_INT, SLT_INT},
{"HIDELINES", SLT_VOID, SCI_HIDELINES, SLT_INT, SLT_INT},
{"GETLINEVISIBLE", SLT_BOOL, SCI_GETLINEVISIBLE, SLT_INT, SLT_VOID},
+ {"GETALLLINESVISIBLE", SLT_BOOL, SCI_GETALLLINESVISIBLE, SLT_VOID, SLT_VOID},
{"SETFOLDEXPANDED", SLT_VOID, SCI_SETFOLDEXPANDED, SLT_INT, SLT_BOOL},
{"GETFOLDEXPANDED", SLT_BOOL, SCI_GETFOLDEXPANDED, SLT_INT, SLT_VOID},
{"TOGGLEFOLD", SLT_VOID, SCI_TOGGLEFOLD, SLT_INT, SLT_VOID},
@@ -490,6 +496,8 @@
{"SETCHARSDEFAULT", SLT_VOID, SCI_SETCHARSDEFAULT, SLT_VOID, SLT_VOID},
{"AUTOCGETCURRENT", SLT_INT, SCI_AUTOCGETCURRENT, SLT_VOID, SLT_VOID},
{"AUTOCGETCURRENTTEXT", SLT_INT, SCI_AUTOCGETCURRENTTEXT, SLT_VOID, SLT_STRINGRESULT},
+ {"AUTOCSETCASEINSENSITIVEBEHAVIOUR", SLT_VOID, SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR, SLT_INT, SLT_VOID},
+ {"AUTOCGETCASEINSENSITIVEBEHAVIOUR", SLT_INT, SCI_AUTOCGETCASEINSENSITIVEBEHAVIOUR, SLT_VOID, SLT_VOID},
{"ALLOCATE", SLT_VOID, SCI_ALLOCATE, SLT_INT, SLT_VOID},
{"TARGETASUTF8", SLT_INT, SCI_TARGETASUTF8, SLT_VOID, SLT_STRINGRESULT},
{"SETLENGTHFORENCODE", SLT_VOID, SCI_SETLENGTHFORENCODE, SLT_INT, SLT_VOID},
@@ -519,6 +527,8 @@
{"GETPOSITIONCACHE", SLT_INT, SCI_GETPOSITIONCACHE, SLT_VOID, SLT_VOID},
{"COPYALLOWLINE", SLT_VOID, SCI_COPYALLOWLINE, SLT_VOID, SLT_VOID},
{"GETCHARACTERPOINTER", SLT_INT, SCI_GETCHARACTERPOINTER, SLT_VOID, SLT_VOID},
+ {"GETRANGEPOINTER", SLT_INT, SCI_GETRANGEPOINTER, SLT_INT, SLT_INT},
+ {"GETGAPPOSITION", SLT_INT, SCI_GETGAPPOSITION, SLT_VOID, SLT_VOID},
{"SETKEYSUNICODE", SLT_VOID, SCI_SETKEYSUNICODE, SLT_BOOL, SLT_VOID},
{"GETKEYSUNICODE", SLT_BOOL, SCI_GETKEYSUNICODE, SLT_VOID, SLT_VOID},
{"INDICSETALPHA", SLT_VOID, SCI_INDICSETALPHA, SLT_INT, SLT_INT},
@@ -615,6 +625,12 @@
{"REGISTERRGBAIMAGE", SLT_VOID, SCI_REGISTERRGBAIMAGE, SLT_INT, SLT_STRING},
{"SCROLLTOSTART", SLT_VOID, SCI_SCROLLTOSTART, SLT_VOID, SLT_VOID},
{"SCROLLTOEND", SLT_VOID, SCI_SCROLLTOEND, SLT_VOID, SLT_VOID},
+ {"SETTECHNOLOGY", SLT_VOID, SCI_SETTECHNOLOGY, SLT_INT, SLT_VOID},
+ {"GETTECHNOLOGY", SLT_INT, SCI_GETTECHNOLOGY, SLT_VOID, SLT_VOID},
+ {"CREATELOADER", SLT_INT, SCI_CREATELOADER, SLT_INT, SLT_VOID},
+ {"FINDINDICATORSHOW", SLT_VOID, SCI_FINDINDICATORSHOW, SLT_INT, SLT_INT},
+ {"FINDINDICATORFLASH", SLT_VOID, SCI_FINDINDICATORFLASH, SLT_INT, SLT_INT},
+ {"FINDINDICATORHIDE", SLT_VOID, SCI_FINDINDICATORHIDE, SLT_VOID, SLT_VOID},
{"STARTRECORD", SLT_VOID, SCI_STARTRECORD, SLT_VOID, SLT_VOID},
{"STOPRECORD", SLT_VOID, SCI_STOPRECORD, SLT_VOID, SLT_VOID},
{"SETLEXER", SLT_VOID, SCI_SETLEXER, SLT_INT, SLT_VOID},
Modified: wscript
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -87,7 +87,7 @@ def configure(conf):
args='--cflags --libs')
check_cfg_cached(conf,
package='geany',
- atleast_version='1.22',
+ atleast_version='1.23',
uselib_store='GEANY',
mandatory=True,
args='--cflags --libs')
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
More information about the Plugins-Commits
mailing list