7 files changed, 680 insertions, 106 deletions

diff --git a/development/scite/README b/development/scite/README
index 905c7c95c47e..40d2af8e4dac 100644
--- a/development/scite/README
+++ b/development/scite/README
@@ -4,11 +4,12 @@ for building and running programs. It is best used for jobs with simple
 configurations.
 
 There are example configuration files provided with the tarball.
-If you'd like to use it (at your own risk), see the different options at
-http://www.scintilla.org/SciTEDoc.html, rename SciTEUser.properties.new
-to .SciTEUser.properties, and place it in your user's homedir.
+If you'd like to use it (at your own risk), 
+see the different options at http://www.scintilla.org/SciTEDoc.html, 
+rename SciTEUser.properties.new to .SciTEUser.properties,
+and place it in your user's homedir.
 
-Please look into /usr/doc/scite-3.02 after installation to find the
-example configuration files and additional documentation.
+Please look into /usr/doc/scite-3.20 after installation to find
+the example configuration files and additional documentation.
 
 
diff --git a/development/scite/config/README.Slackware b/development/scite/config/README.Slackware
index 9d0a6014b35d..79ad45884359 100644
--- a/development/scite/config/README.Slackware
+++ b/development/scite/config/README.Slackware
@@ -4,12 +4,23 @@ SciTE.SlackBuild
 
 The SciTE.SlackBuild is now also available from git: git://github.com/schiffsratte/scite.slackbuild.git
 
+Changes in Version 3.2.0:
+- allows Ctrl to be used with mouse double and triple clicks to add words and lines to the selection.
+- can define a button as the default in strips.
+- can save files automatically in the background and scripts can create user interfaces as strips.
+- supports printing on GTK+ 2.x and uses fractional positioning in more situations.
+
+Changes in Version 3.0.2:
 In version 3.02 SciTE's GTK+3 support has still improved, it will integrate nicely into the Gnome3
 Desktop and use Adwaita or any other GTK+3 theme, if installed.
 It now saves files in the background and can print on GTK+3.
+
+Changes in Version 2.29:
 Since 2.29 it always draws with Cairo on GTK+, gdk-pixbuf is no longer needed - compilation errors with GSB-Desktop installed at the same time are gone.
 The handling of the "properties" files has been changed again to avoid the replacement
 of existing settings. 
+
+In general:
 All examples can be found now in /usr/doc/scite-$ver as it seems the right place to put them.
 The also got the extension "new" to mark them as templates.
 The main file SciTEGlobal.properties doesn't get altered anymore from within the SlackBuild (with one exception),but if you made changes to your existing SciTEGlobal.properties file, you need to back it up, 
@@ -21,6 +32,6 @@ For example with Bluefish installed the help pages might open with Bluefish inst
 As a full Slackware installation installs Seamonkey, the mozilla command should make sure to open the help pages in a browser.
 If you prefer the system standard browser instead, comment out line 51/52 of the SlackBuild.
 The SciTEUser.properties in your home directory stays untouched and will not be invalidated anymore from the changes in SciTEGlobal.properties.
-
 Finally the CFLAGS have been removed from the SlackBuild, as the makefiles of Scintilla and Scite use those flags, which had been replaced before, now by default.
-
+For v3.20 there are many more options in the SciTEGlobal.properties (all I could find), but most of them are commented out.
+Please review those files and make your changes before using them. 
diff --git a/development/scite/config/SciTEGlobal.properties.new b/development/scite/config/SciTEGlobal.properties.new
index 8a954b8a45dc..02b079ea3468 100644
--- a/development/scite/config/SciTEGlobal.properties.new
+++ b/development/scite/config/SciTEGlobal.properties.new
@@ -1,105 +1,620 @@
-# Those settings get merged at package build time
-# USER DEFINED SETTINGS
-# Globals
+# Global initialisation file for SciTE
+# For Linux, place in $prefix/share/scite
+# For Windows, place in same directory as SciTE.EXE (or Sc1.EXE)
+# Documentation at http://www.scintilla.org/SciTEDoc.html
 
-minimize.to.tray=1
-output.scroll=1
-tabbar.multiline=1
-toolbar.visible=1
-toolbar.usestockicons=1
-statusbar.visible=1
-pathbar.visible=1
-horizontal.scrollbar=1
-horizontal.scroll.width=700
-check.if.already.open=1
-fileselector.width=800
-fileselector.height=600
-fileselector.show.hidden=1
+# Globals
 
+# Window sizes and visibility
+if PLAT_WIN
+	position.left=0
+	position.top=0
+if PLAT_GTK
+	position.left=5
+	position.top=22
+position.width=576
+position.height=740
+#position.maximize=1
+#position.tile=1
+#full.screen.hides.menu=1
+#minimize.to.tray=1
+split.vertical=1
+#output.horizontal.size=200
+#output.vertical.size=60
+#output.initial.hide=1
+#horizontal.scrollbar=0
+#horizontal.scroll.width=10000
+#horizontal.scroll.width.tracking=0
+#output.horizontal.scrollbar=0
+#output.horizontal.scroll.width=10000
+#output.horizontal.scroll.width.tracking=0
+#output.scroll=0
+#error.select.line=1
+#end.at.last.line=0
+tabbar.visible=1
+#tabbar.hide.one=1
+#tabbar.multiline=1
+#toolbar.visible=1
+#toolbar.detachable=1
+#toolbar.usestockicons=1
+#menubar.detachable=1
+#undo.redo.lazy=1
+#statusbar.visible=1
+#fileselector.width=800
+#fileselector.height=600
+#fileselector.show.hidden=1
+#magnification=-1
+#output.magnification=-1
 
 # Sizes and visibility in edit pane
-
+#line.margin.visible=1
+line.margin.width=4
+margin.width=16
+#fold.margin.width=16
+#fold.margin.colour=#FF0000
+#fold.margin.highlight.colour=#0000FF
+#blank.margin.left=4
+#blank.margin.right=4
+buffered.draw=1
+#two.phase.draw=0
+#technology=1
 
 # Element styles
-
+#view.eol=1
+#control.char.symbol=.
+caret.period=500
+view.whitespace=0
+view.indentation.whitespace=1
+view.indentation.guides=1
+view.indentation.examine=3
+highlight.indentation.guides=1
+#caret.fore=#FF0000
+#caret.additional.blinks=0
+#caret.width=2
+#caret.line.back=#FFFED8
+#caret.line.back.alpha=63
+edge.column=200
+edge.mode=0
+edge.colour=#C0DCC0
+braces.check=1
+braces.sloppy=1
+#selection.fore=#006000
+# DADADA used as background because it yields standard silver C0C0C0
+# on low colour displays and a reasonable light grey on higher bit depths
+if PLAT_WINNT
+	selection.alpha=32
+	selection.back=#000000
+if PLAT_GTK
+	selection.alpha=30
+	selection.back=#000000
+if PLAT_MAC
+	selection.alpha=32
+	selection.back=#000000
+#selection.additional.fore=#0000A0
+#selection.additional.back=#000080
+#selection.additional.alpha=20
+#selection.multiple=0
+#selection.additional.typing=0
+#virtual.space=3
+#rectangular.selection.modifier=4
+#whitespace.fore=#FF0000
+#whitespace.back=#FFF0F0
+#error.marker.fore=#0000A0
+#error.marker.back=#DADAFF
+#error.inline=1
+#bookmark.fore=#808000
+#bookmark.back=#FFFFA0
+#bookmark.alpha=
+#find.mark=#0000FF
+#highlight.current.word=1
+#highlight.current.word.by.style=1
+#highlight.current.word.colour=#00D040
+#indicators.alpha=63
+#indicators.under=1
 
 # Scripting
-
+ext.lua.startup.script=$(SciteUserHome)/SciTEStartup.lua
+ext.lua.auto.reload=1
+#ext.lua.reset=1
 
 # Checking
-save.all.for.build=1
-check.if.already.open=1
-
+are.you.sure=1
+#are.you.sure.for.build=1
+#save.all.for.build=1
+#quit.on.close.last=1
+#load.on.activate=1
+#save.on.deactivate=1
+#are.you.sure.on.reload=1
+#reload.preserves.undo=1
+#check.if.already.open=1
+#temp.files.sync.load=1
 default.file.ext=.cxx
-save.session=1
-session.bookmarks=1
-
+#source.default.extensions=.h|.cxx|.bat
+#title.full.path=1
+#title.show.buffers=1
+#pathbar.visible=1
+#save.recent=1
+#save.session=1
+#session.bookmarks=1
+#session.folds=1
+#save.position=1
+#open.dialog.in.file.directory=1
+#strip.trailing.spaces=1
+#ensure.final.line.end=1
+#ensure.consistent.line.ends=1
+#save.deletes.first=1
+#save.check.modified.time=1
+buffers=40
+#buffers.zorder.switching=1
+#api.*.cxx=d:\api\w.api
+#locale.properties=locale.de.properties
+#translation.missing=***
+#read.only=1
+#background.open.size=20000
+#background.save.size=20000
+#max.file.size=1
 
 # Indentation
+tabsize=8
+indent.size=8
+use.tabs=1
+#indent.auto=1
+indent.automatic=1
+indent.opening=0
+indent.closing=0
+#tab.indents=0
+#backspace.unindents=0
 
 # Wrapping of long lines
-wrap=1
-wrap.style=2
-output.wrap=1
-
+#wrap=1
+#wrap.style=2
+#cache.layout=3
+#output.wrap=1
+#output.cache.layout=3
+#wrap.visual.flags=3
+#wrap.visual.flags.location=3
+#wrap.indent.mode=1
+#wrap.visual.startindent=4
 
 # Folding
 # enable folding, and show lines below when collapsed.
-
+fold=1
+fold.compact=1
+fold.flags=16
+fold.symbols=1
+#fold.highlight=1
+#fold.highlight.colour=#00C0C0
+#fold.on.open=1
+fold.comment=1
+fold.preprocessor=1
 
 # Find and Replace
-if PLAT_GTK
-	find.command=grep --line-number "$(find.what)" $(find.files)
-
-
-find.in.dot=1
-find.in.binary=1
+# Internal search always available with recursive capability so use in preference to external tool
+find.command=
+# findstr is available on recent versions of Windows including 2000
+#if PLAT_WIN
+#	find.command=findstr /n /s $(find.what) $(find.files)
+#find.input=$(find.what)
+#if PLAT_GTK
+#	find.command=grep --line-number "$(find.what)" $(find.files)
+find.files=*.c *.cxx *.h
+#find.in.files.close.on.find=0
+#find.in.dot=1
+#find.in.binary=1
+#find.close.on.find=0
+#find.replace.matchcase=1
+#find.replace.escapes=1
+#find.replace.regexp=1
+#find.replace.regexp.posix=1
+#find.replace.wrap=0
+#find.replacewith.focus=0
+#find.replace.advanced=1
+#find.use.strip=1
+#replace.use.strip=1
+#strip.button.height=24
 
 # Behaviour
-
-tabsize=3
-indent.size=3
-
-autocompleteword.automatic=1
-
-if PLAT_GTK
-	font.base=font:!Bitstream Vera Sans Mono,size:12
-	# font.base=font:Arial,size:10
-	font.small=$(font.base)
-	font.comment=$(font.base)
-	font.code.comment.box=$(font.comment)
-	font.code.comment.line=$(font.comment)
-	font.code.comment.doc=$(font.comment)
-	font.text=$(font.base)
-	font.text.comment=$(font.base)
-	font.embedded.base=$(font.base)
-	font.embedded.comment=$(font.base)
-	font.monospace=$(font.base)
-	font.vbs=$(font.base)
-font.js=$(font.comment)
-
-comment.block.hypertext=//~
-comment.block.sql=--~
-xml.auto.close.tags=1
+#eol.mode=LF
+eol.auto=1
+clear.before.execute=0
+#vc.home.key=1
+#wrap.aware.home.end.keys=1
+#autocompleteword.automatic=1
+#autocomplete.choose.single=1
+caret.policy.xslop=1
+caret.policy.width=20
+caret.policy.xstrict=0
+caret.policy.xeven=0
+caret.policy.xjumps=0
+caret.policy.yslop=1
+caret.policy.lines=1
+caret.policy.ystrict=1
+caret.policy.yeven=1
+caret.policy.yjumps=0
+#visible.policy.strict=1
+#visible.policy.slop=1
+#visible.policy.lines=4
+#time.commands=1
+#caret.sticky=1
+#properties.directory.enable=1
 
 # Status Bar
-
+statusbar.number=4
+statusbar.text.1=\
+li=$(LineNumber) co=$(ColumnNumber) $(OverType) ($(EOLMode)) $(FileAttr)
+statusbar.text.2=\
+$(BufferLength) chars in $(NbOfLines) lines. Sel: $(SelLength) chars.
+statusbar.text.3=\
+Now is: Date=$(CurrentDate) Time=$(CurrentTime)
+statusbar.text.4=\
+$(FileNameExt) : $(FileDate) - $(FileTime) | $(FileAttr)
+
+if PLAT_WIN
+	command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html"
+	command.scite.help.subsystem=2
 if PLAT_GTK
 	command.print.*=a2ps "$(FileNameExt)"
 	command.scite.help=mozilla "file://$(SciteDefaultHome)/SciTEDoc.html"
 
 # Internationalisation
-
+# Japanese input code page 932 and ShiftJIS character set 128
+#code.page=932
+#character.set=128
+# Unicode
+#code.page=65001
+code.page=0
+#character.set=204
+#command.discover.properties=python /home/user/FileDetect.py "$(FilePath)"
+# Required for Unicode to work on GTK+:
+#LC_CTYPE=en_US.UTF-8
+if PLAT_GTK
+	output.code.page=65001
+if PLAT_MAC
+	output.code.page=65001
 
 # Export
+#export.keep.ext=1
+export.html.wysiwyg=1
+#export.html.tabs=1
+#export.html.folding=1
+export.html.styleused=1
+#export.html.title.fullpath=1
+#export.rtf.tabs=1
+#export.rtf.font.face=Arial
+#export.rtf.font.size=9
+#export.rtf.tabsize=8
+#export.rtf.wysiwyg=0
+#export.tex.title.fullpath=1
+# Magnification (added to default screen font size)
+export.pdf.magnification=0
+# Font: Courier, Helvetica or Times (Courier line-wraps)
+export.pdf.font=Helvetica
+# Page size (in points): width, height
+# E.g. Letter 612,792; A4 595,842; maximum 14400,14400
+export.pdf.pagesize=595,842
+# Margins (in points): left, right, top, bottom
+export.pdf.margins=72,72,72,72
+export.xml.collapse.spaces=1
+export.xml.collapse.lines=1
 
 # Define values for use in the imported properties files
+chars.alpha=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+chars.numeric=0123456789
+chars.accented=ŠšŒœŸÿÀàÁáÂâÃãÄäÅåÆæÇçÈèÉéÊêËëÌìÍíÎîÏïÐðÑñÒòÓóÔôÕõÖØøÙùÚúÛûÜüÝýÞþßö
+# This is a better set for Russian:
+#chars.accented=ÀàÁáÂâÃãÄäÅ娸ÆæÇçÈèÉéÊêËëÌìÍíÎîÏïÐðÑñÒòÓóÔôÕõÖö×÷ØøÙùÚúÛûÜüÝýÞþßÿ
+
+# The open.filter setting is used in the file selector which has a menu of filters to apply
+# to the types of files seen when opening.
+# There is a limit (possibly 256 characters) to the length of a filter on Windows,
+# so not all source extensions can be in this setting.
+source.files=*.asm;*.c;*.cc;*.cpp;*.cxx;*.cs;*.h;*.hh;*.hxx;*.hpp;\
+*.idl;*.odl;*.rc;*.rc2;*.dlg;*.def;\
+*.vb;*.vbs;*.bas;*.frm;*.cls;*.ctl;\
+*.java;*.js;*.py;*.pl;*.rb;*.cgi;*.lua;*.conf;\
+make*;*.mak;\
+*.properties;*.html;*.xml;*.iface;*.bat;*.e;*.m;*.mm
+
+# Each platform has a different idea of the most important filters
+if PLAT_WIN
+	all.files=All Files (*.*)|*.*|
+	top.filters=All Source|$(source.files)|$(all.files)
+if PLAT_GTK
+	all.files=All Files (*)|*|Hidden Files (.*)|.*|
+	top.filters=All Source|$(source.files)|$(all.files)
+# As OS X only greys out filtered files, show all as default
+if PLAT_MAC
+	all.files=All Files (*.*)|*.*|
+	top.filters=$(all.files)All Source|$(source.files)|
+
+open.filter=\
+$(top.filters)\
+$(filter.ada)\
+$(filter.conf)\
+$(filter.asm)\
+$(filter.asn1)\
+$(filter.ave)\
+$(filter.baan)\
+$(filter.bash)\
+$(filter.caml)\
+$(filter.cmake)\
+$(filter.cpp)\
+#$(filter.ch)\
+$(filter.css)\
+$(filter.d)\
+$(filter.eiffel)\
+$(filter.erlang)\
+$(filter.fortran)\
+$(filter.gap)\
+#$(filter.hs)\
+$(filter.idl)\
+$(filter.inno)\
+$(filter.java)\
+$(filter.js)\
+$(filter.kix)\
+$(filter.lout)\
+$(filter.lua)\
+$(filter.matlab)\
+$(filter.metapost)\
+$(filter.mmixal)\
+#$(filter.modula3)\
+$(filter.nncrontab)\
+$(filter.nsis)\
+$(filter.opal)\
+$(filter.pascal)\
+$(filter.perl)\
+$(filter.php)\
+$(filter.pov)\
+$(filter.powershell)\
+$(filter.prg)\
+$(filter.properties)\
+$(filter.ps)\
+$(filter.python)\
+$(filter.r)\
+$(filter.ruby)\
+$(filter.sql)\
+$(filter.specman)\
+$(filter.tcl)\
+$(filter.tex)\
+$(filter.text)\
+$(filter.txt2tags)\
+$(filter.vb)\
+$(filter.web)\
+$(filter.yaml)\
+$(filter.verilog)\
+$(filter.vhdl)
+
+#save.filter=$(open.filter)
+
+# Give symbolic names to the set of fonts used in the standard styles.
+if PLAT_WIN
+	font.base=font:Verdana,size:10
+	font.small=font:Verdana,size:8
+	font.comment=font:Comic Sans MS,size:9
+	font.code.comment.box=$(font.comment)
+	font.code.comment.line=$(font.comment)
+	font.code.comment.doc=$(font.comment)
+	font.code.comment.nested=$(font.comment)
+	font.text=font:Times New Roman,size:11
+	font.text.comment=font:Verdana,size:9
+	font.embedded.base=font:Verdana,size:9
+	font.embedded.comment=font:Comic Sans MS,size:8
+	font.monospace=font:Courier New,size:10
+	font.vbs=font:Lucida Sans Unicode,size:10
+if PLAT_GTK
+	font.base=font:!Bitstream Vera Sans,size:9
+	font.small=font:!Bitstream Vera Sans,size:8
+	font.comment=font:!Bitstream Vera Serif,size:9
+	font.code.comment.box=$(font.comment)
+	font.code.comment.line=$(font.comment)
+	font.code.comment.doc=$(font.comment)
+	font.code.comment.nested=$(font.comment)
+	font.text=font:!Bitstream Charter,size:10
+	font.text.comment=font:!Serif,size:9
+	font.embedded.base=font:!Serif,size:9
+	font.embedded.comment=font:!Serif,size:9
+	font.monospace=font:!Bitstream Vera Sans Mono,size:9
+	font.vbs=font:!Bitstream Vera Sans Mono,size:9
+if PLAT_MAC
+	font.base=font:Verdana,size:12
+	font.small=font:Verdana,size:10
+	font.comment=font:Georgia,size:13
+	font.code.comment.box=$(font.comment)
+	font.code.comment.line=$(font.comment)
+	font.code.comment.doc=$(font.comment)
+	font.code.comment.nested=$(font.comment)
+	font.text=font:Times New Roman,size:13
+	font.text.comment=font:Verdana,size:11
+	font.embedded.base=font:Verdana,size:11
+	font.embedded.comment=font:Comic Sans MS,size:10
+	font.monospace=font:Courier New,size:12
+	font.vbs=font:Lucida Sans Unicode,size:12
+font.js=$(font.comment)
 
-Apache Confi&g|conf||\
-CMake|cmake||\
-&nnCron crontab|tab||\
+# Old GTK+ font settings are faster but not antialiased
+	#~ font.base=font:lucidatypewriter,size:12
+	#~ font.small=font:lucidatypewriter,size:10
+	#~ font.comment=font:new century schoolbook,size:12
+	#~ font.code.comment.box=$(font.comment)
+	#~ font.code.comment.line=$(font.comment)
+	#~ font.code.comment.doc=$(font.comment)
+	#~ font.text=font:times,size:14
+	#~ font.text.comment=font:lucidatypewriter,size:10
+	#~ font.embedded.base=font:lucidatypewriter,size:12
+	#~ font.embedded.comment=font:lucidatypewriter,size:12
+	#~ font.monospace=font:courier,size:12
+	#~ font.vbs=font:new century schoolbook,size:12
+
+# Give symbolic names to the set of colours used in the standard styles.
+colour.code.comment.box=fore:#007F00
+colour.code.comment.line=fore:#007F00
+colour.code.comment.doc=fore:#3F703F
+colour.code.comment.nested=fore:#A0C0A0
+colour.text.comment=fore:#0000FF,back:#D0F0D0
+colour.other.comment=fore:#007F00
+colour.embedded.comment=back:#E0EEFF
+colour.embedded.js=back:#F0F0FF
+colour.notused=back:#FF0000
+
+colour.number=fore:#007F7F
+colour.keyword=fore:#00007F
+colour.string=fore:#7F007F
+colour.char=fore:#7F007F
+colour.operator=fore:#000000
+colour.preproc=fore:#7F7F00
+colour.error=fore:#FFFF00,back:#FF0000
+
+# Global default styles for all languages
+# Default
+style.*.32=$(font.base)
+# Line number
+style.*.33=back:#C0C0C0,$(font.base)
+# Brace highlight
+style.*.34=fore:#0000FF,bold
+# Brace incomplete highlight
+style.*.35=fore:#FF0000,bold
+# Control characters
+style.*.36=
+# Indentation guides
+style.*.37=fore:#C0C0C0,back:#FFFFFF
+
+# Printing
+#print.colour.mode=1
+print.magnification=-1
+# Windows-only setup: left, right, top, bottom margins, in local units:
+# hundredths of millimeters or thousandths of inches
+print.margins=1500,1000,1000,1500
+# Header/footer:
+print.header.format=$(FileNameExt) -- Printed on $(CurrentDate), $(CurrentTime) -- Page $(CurrentPage)
+print.footer.format=$(FilePath) -- File date: $(FileDate) -- File time: $(FileTime)
+# Header/footer style
+print.header.style=font:Arial,size:12,bold
+print.footer.style=font:Arial Narrow,size:10,italics
+
+# Warnings - only works on Windows and needs to be pointed at files on machine
+#if PLAT_WIN
+#	warning.findwrapped=100,E:\Windows\Media\SFX\Boing.wav
+#	warning.notfound=0,Effect.wav
+#	warning.wrongfile=0,Glass.wav
+#	warning.executeok=0,Fanfare.wav
+#	warning.executeko=100,GlassBreak.wav
+#	warning.nootherbookmark=100,Boing2.wav
+
+# Define the Lexer menu,
+# Each item contains three parts: menu string | file extension | key
+# The only keys allowed currently are based on F-keys and alphabetic keys and look like
+# [Ctrl+][Shift+][Fn|a] such as F12 or Ctrl+Shift+D.
+# A '&' may be placed before a letter to be used as an accelerator. This does not work on GTK+.
+
+keyText=Shift+F11
+keyMake=Ctrl+Shift+F11
+keyHTML=F12
+keyXML=Shift+F12
+# On OS X, F11 is used by Expose, F12 by Dashbard
+if PLAT_MAC
+	os.x.home.end.keys=1
+	keyText=Shift+F13
+	keyMake=Ctrl+Shift+F13
+	keyHTML=Ctrl+Shift+F14
+	keyXML=Shift+F14
+
+menu.language=\
+#FreeBasic|bas||\
+Text|txt|$(keyText)|\
+Ada|ads||\
+#Apache Confi&g|conf||\
+Assembler|asm||\
+#ASN.1|asn1||\
+#Avenue|ave||\
+#Baan|bc||\
+&Batch|bat||\
+#Bullant|ant||\
+&C / C++|c||\
+#CMake|cmake||\
+C&#|cs||\
+#COBOL|cob||\
+#Csound|orc||\
+CSS|css||\
+D|d||\
+&Difference|diff||\
+#&Eiffel|e||\
+#Erlang|erl||\
+&Errorlist|err||\
+#FlagShip|prg||\
+#Forth|forth||\
+&Fortran|f90||\
+#Gap|g||\
+#Haskell|hs||\
+H&ypertext|html|$(keyHTML)|\
+#&InnoSetup|iss||\
+&Java|java||\
+Java&Script|js||\
+#&Kix|kix||\
+Lisp|lisp||\
+#Lot|lot||\
+#Lout|lt||\
+Lu&a|lua||\
+Matlab|m.matlab||\
+&Makefile|mak|$(keyMake)|\
+#MetaPost|mp||\
+#MMIXAL|mms||\
+#Modula-3|m3||\
+#&nnCron crontab|tab||\
+#NSIS|nsis||\
+#Objective Caml|ml||\
+#Octave|m.octave||\
+#Opal|impl||\
+Pascal|pas||\
+Pe&rl|pl||\
+P&HP|php||\
+#P&LSQL|spec||\
+#P&ostScript|ps||\
+#P&OV-Ray SDL|pov||\
+#PowerShell|ps1||\
+#PowerPro|powerpro||\
+&Properties|properties||\
+Pytho&n|py||\
+#R|R||\
+#Reso&urce|rc||\
+Ruby|rb||\
+Shell|sh||\
+S&QL|sql||\
+#Specman|e||\
+&TCL|tcl||\
+TeX|tex||\
+#&txt2tags|t2t||\
+&VB|vb||\
+VBScr&ipt|vbs||\
+#Verilog|v||\
+#VHDL|vhd||\
+&XML|xml|$(keyXML)|\
+YAML|yaml||
+
+# User defined key commands
+user.shortcuts=\
+Ctrl+Shift+V|IDM_PASTEANDDOWN|\
+Ctrl+PageUp|IDM_PREVFILE|\
+Ctrl+PageDown|IDM_NEXTFILE|
+
+#KeypadPlus|IDM_EXPAND|\
+#KeypadMinus|IDM_BLOCK_COMMENT|
+
+#user.context.menu=\
+#||\
+#Next File|IDM_NEXTFILE|\
+#Prev File|IDM_PREVFILE|
+
+# To keep menus short, these .properties files are not loaded by default.
+imports.exclude=abaqus asn1 au3 avenue baan blitzbasic bullant \
+cobol cmake csound escript flagship forth freebasic gap haskell inno \
+kix latex lot lout metapost mmixal modula3 nimrod nncrontab nsis \
+opal powerpro powershell purebasic r rebol \
+scriptol smalltalk sorcins spice specman \
+tacl tal txt2tags verilog vhdl
+# Newly removed: avenue baan escript lot metapost mmixal
+# The set of imports allowed can be set with
+#imports.include=avenue
+
+# Import all the language specific properties files in this directory
+import *
 
-# Import all the language specific properties files
-import cmake
-import nncrontab
-lexer.*.slackbuilds=shell
diff --git a/development/scite/config/SciTEUser.properties.new b/development/scite/config/SciTEUser.properties.new
index 23477b7affb4..929e0c7290a6 100644
--- a/development/scite/config/SciTEUser.properties.new
+++ b/development/scite/config/SciTEUser.properties.new
@@ -1,31 +1,75 @@
+# USER DEFINED SETTINGS
+
 if PLAT_GTK
 	position.left=0
 	position.top=0
+
 position.width=1015
 position.height=717
-
 minimize.to.tray=1
+output.scroll=1
+tabbar.multiline=1
 toolbar.visible=1
+toolbar.usestockicons=1
+statusbar.visible=1
+pathbar.visible=1
 horizontal.scrollbar=1
 horizontal.scroll.width=700
+check.if.already.open=1
+fileselector.width=800
+fileselector.height=600
+fileselector.show.hidden=1
 
-tabbar.visible=1
-statusbar.visible=1
-pathbar.visible=1
+
+# Sizes and visibility in edit pane
+
+
+# Element styles
+
+
+# Scripting
+
+
+# Checking
+save.all.for.build=1
 check.if.already.open=1
 
-tabsize=3
-indent.size=3
+default.file.ext=.cxx
+save.session=1
+session.bookmarks=1
+
+
+# Indentation
+
+# Wrapping of long lines
+wrap=1
+wrap.style=2
+output.wrap=1
+
+
+# Folding
+# enable folding, and show lines below when collapsed.
+
+
+# Find and Replace
+if PLAT_GTK
+	find.command=grep --line-number "$(find.what)" $(find.files)
+
+
+find.in.dot=1
+find.in.binary=1
+
+tabsize=4
+indent.size=4
 
 autocompleteword.automatic=1
 
 # if you want to be able to edit Unicode files, uncomment this:
-#code.page=65001
-#LC_CTYPE=en_US.UTF-8
+code.page=65001
+LC_CTYPE=en_US.UTF-8
 
 if PLAT_GTK
-	font.base=font:!Bitstream Vera Sans Mono,size:12
-	# font.base=font:Arial,size:10
+	font.base=font:!Bitstream Vera Sans Mono,size:10
 	font.small=$(font.base)
 	font.comment=$(font.base)
 	font.code.comment.box=$(font.comment)
@@ -42,3 +86,12 @@ font.js=$(font.comment)
 comment.block.hypertext=//~
 comment.block.sql=--~
 xml.auto.close.tags=1
+
+Apache Confi&g|conf||\
+CMake|cmake||\
+&nnCron crontab|tab||\
+
+# Import all the language specific properties files
+import cmake
+import nncrontab
+lexer.*.SlackBuild=shell
\ No newline at end of file
diff --git a/development/scite/config/changelog b/development/scite/config/changelog
index 0ebafeb62acd..50e49e2626ec 100644
--- a/development/scite/config/changelog
+++ b/development/scite/config/changelog
@@ -1,4 +1,4 @@
-SciTE.SlackBuild changelog as of 28/December 2011
+SciTE.SlackBuild changelog as of 18/June 2012
 
 v2.21: 1): Initial? version written by Iskar Enev <iskar.enev[@]gmail.com>
 v2.27: 1): Some modifications and new maintainer Jens Weber <jens@tuxane.com>
@@ -7,3 +7,4 @@ v3.02: 1): Changed the handling of the "properties" files to avoid to overwrite
        2): The example files are now in /usr/doc/scite-VERSION 
        3): SciTEGlobal.properties changed browser to mozilla
        4): The SlackBuild doesn't change the CFLAGS anymore .
+v3.20  1): version update
diff --git a/development/scite/scite.SlackBuild b/development/scite/scite.SlackBuild
index 71777c6cd5dc..eb42a771a2e8 100644
--- a/development/scite/scite.SlackBuild
+++ b/development/scite/scite.SlackBuild
@@ -3,9 +3,10 @@
 # Written by Iskar Enev <iskar.enev[@]gmail.com>
 # v2.27: Some modifications by Jens Weber <jens@tuxane.com>
 # v3.02: (jw) Some more changes, see README.Slackware and changelog
+# v3.20: (jw) little changes, see README.Slackware and changelog
 
 PRGNAM=scite
-VERSION=3.02
+VERSION=3.20
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -25,17 +26,13 @@ HELPBROWSER=mozilla
 
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
+    LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+    LIBDIRSUFFIX=""
 fi
 
 set -eu
@@ -49,15 +46,11 @@ chown -R root:root scite/ scintilla/
 chmod -R u+w,go+r-w,a-s scite/ scintilla/
 
 cd $TMP/scintilla
-sed -i "s/^\(CXXFLAGS\)/\1+/g" gtk/makefile
-CXXFLAGS="$SLKCFLAGS" \
 make -C gtk prefix=/usr
 
 cd $TMP/scite
 sed -i "s%xdg-open%$HELPBROWSER%g" src/Embedded.properties
 sed -i "s%xdg-open%$HELPBROWSER%g" src/SciTEGlobal.properties
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 make -C gtk prefix=/usr
 make -C gtk install DESTDIR=$PKG
 
@@ -78,7 +71,7 @@ cat $CWD/config/changelog >> $PKG/usr/doc/$PRGNAM-$VERSION/changelog
 cat $CWD/config/README.Slackware >> $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
 
 
-for i in $PKG/usr/share/scite/*.html $PKG/usr/share/scite/*.png ; do 
+for i in $PKG/usr/share/scite/*.html $PKG/usr/share/scite/*.png ; do
   ln -s /usr/share/scite/$(basename $i) \
         $PKG/usr/doc/$PRGNAM-$VERSION/html/$(basename $i) ;
 done
diff --git a/development/scite/scite.info b/development/scite/scite.info
index 9c1a0f7e5bb3..06e50cb5dde8 100644
--- a/development/scite/scite.info
+++ b/development/scite/scite.info
@@ -1,10 +1,10 @@
 PRGNAM="scite"
-VERSION="3.02"
+VERSION="3.20"
 HOMEPAGE="http://scintilla.org/SciTE.html"
-DOWNLOAD="http://downloads.sourceforge.net/scintilla/scite302.tgz"
-MD5SUM="928a4ef3773fe7eb30799bece8b3b879"
+DOWNLOAD="http://downloads.sourceforge.net/scintilla/scite320.tgz"
+MD5SUM="536b375c5d4621aecbbf986bbf4c6f13"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Jens Weber"
 EMAIL="jens@tuxane.com"
-APPROVED="Niels Horn"
+APPROVED="dsomero"