diff -Nru scite-2.25/debian/changelog scite-3.0.2/debian/changelog
--- scite-2.25/debian/changelog 2012-01-03 03:12:51.000000000 +0000
+++ scite-3.0.2/debian/changelog 2011-12-19 08:41:54.000000000 +0000
@@ -1,8 +1,10 @@
-scite (2.25-1build1) precise; urgency=low
+scite (3.0.2-1) unstable; urgency=low
- * No-change rebuild to drop spurious libsfgcc1 dependency on armhf.
+ * new upstream release (closes: #618346)
+ * move to debhelper 8, drop dpatch
+ * drop custom desktop file and config customization patches
- -- Adam Conrad Fri, 02 Dec 2011 21:20:14 -0700
+ -- Michael Vogt Mon, 19 Dec 2011 09:00:56 +0100
scite (2.25-1) unstable; urgency=low
diff -Nru scite-2.25/debian/compat scite-3.0.2/debian/compat
--- scite-2.25/debian/compat 2012-01-03 03:12:51.000000000 +0000
+++ scite-3.0.2/debian/compat 2011-12-19 08:41:54.000000000 +0000
@@ -1 +1 @@
-5
+8
diff -Nru scite-2.25/debian/control scite-3.0.2/debian/control
--- scite-2.25/debian/control 2012-01-03 03:12:51.000000000 +0000
+++ scite-3.0.2/debian/control 2011-12-19 08:41:54.000000000 +0000
@@ -2,7 +2,7 @@
Section: editors
Priority: optional
Maintainer: Michael Vogt
-Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev, libglib2.0-dev, dpatch
+Build-Depends: debhelper (>= 8.0.0), libgtk2.0-dev, libglib2.0-dev
Standards-Version: 3.7.2
Vcs-Bzr: http://code.launchpad.net/~mvo/scite/debian-sid
diff -Nru scite-2.25/debian/links scite-3.0.2/debian/links
--- scite-2.25/debian/links 1970-01-01 00:00:00.000000000 +0000
+++ scite-3.0.2/debian/links 2011-12-19 08:41:54.000000000 +0000
@@ -0,0 +1 @@
+usr/bin/scite usr/bin/SciTE
diff -Nru scite-2.25/debian/patches/00list scite-3.0.2/debian/patches/00list
--- scite-2.25/debian/patches/00list 2012-01-03 03:12:51.000000000 +0000
+++ scite-3.0.2/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-01_desktop_file.dpatch
-02_config.dpatch
diff -Nru scite-2.25/debian/patches/01_desktop_file.dpatch scite-3.0.2/debian/patches/01_desktop_file.dpatch
--- scite-2.25/debian/patches/01_desktop_file.dpatch 2012-01-03 03:12:51.000000000 +0000
+++ scite-3.0.2/debian/patches/01_desktop_file.dpatch 1970-01-01 00:00:00.000000000 +0000
@@ -1,163 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_config.dpatch by
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' scite-2.25~/scite/gtk/makefile scite-2.25/scite/gtk/makefile
---- scite-2.25~/scite/gtk/makefile 2011-03-17 23:42:00.000000000 +0100
-+++ scite-2.25/scite/gtk/makefile 2011-04-14 12:15:05.601428798 +0200
-@@ -109,7 +109,7 @@
- done
-
- ifdef gnomeprefix
-- $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
-+ #$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
- $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
- endif
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' scite-2.25~/scite/gtk/makefile.rej scite-2.25/scite/gtk/makefile.rej
---- scite-2.25~/scite/gtk/makefile.rej 1970-01-01 01:00:00.000000000 +0100
-+++ scite-2.25/scite/gtk/makefile.rej 2011-04-14 12:14:14.052576354 +0200
-@@ -0,0 +1,14 @@
-+--- scite/gtk/makefile 2004-08-20 10:21:00.000000000 +0200
-++++ tmp/dpep.Px0XCy/scite-1.63/scite/gtk/makefile 2005-05-06 12:29:09.931800784 +0200
-+@@ -123,9 +123,9 @@
-+
-+ ifdef gnomeprefix
-+ ifdef GTK2
-+- $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
-++# $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
-+ else
-+- $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop
-++# $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop
-+ endif
-+ $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
-+ endif
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' scite-2.25~/scite/gtk/makefile.~1~ scite-2.25/scite/gtk/makefile.~1~
---- scite-2.25~/scite/gtk/makefile.~1~ 1970-01-01 01:00:00.000000000 +0100
-+++ scite-2.25/scite/gtk/makefile.~1~ 2011-03-17 23:42:00.000000000 +0100
-@@ -0,0 +1,122 @@
-+# Make file for SciTE on Linux or compatible OS
-+# Copyright 1998-2010 by Neil Hodgson
-+# The License.txt file describes the conditions under which this software may be distributed.
-+# This makefile assumes GCC 4.x is used and changes will be needed to use other compilers.
-+# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
-+
-+.SUFFIXES: .cxx .o .h .a .c
-+ifdef CLANG
-+CC = clang
-+CCOMP = clang
-+else
-+CC = g++
-+CCOMP = gcc
-+endif
-+AR = ar
-+
-+# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
-+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
-+CONFIGLIB:=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
-+CONFIGTHREADS:=
-+gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
-+ifndef prefix
-+ifdef gnomeprefix
-+ prefix=$(gnomeprefix)
-+else
-+ prefix=/usr
-+endif
-+endif
-+datadir=$(prefix)/share
-+pixmapdir=$(datadir)/pixmaps
-+bindir=$(prefix)/bin
-+SYSCONF_PATH=$(prefix)/share/scite
-+
-+INSTALL=install
-+
-+PROG = ../bin/SciTE
-+
-+all: $(PROG)
-+
-+vpath %.h ../src ../../scintilla/include
-+vpath %.cxx ../src
-+
-+INCLUDEDIRS=-I ../../scintilla/include -I ../src
-+#~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
-+CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
-+
-+ifdef DEBUG
-+CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
-+else
-+CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
-+endif
-+
-+ifndef NO_LUA
-+LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
-+ lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
-+ ltable.o ltm.o lundump.o lvm.o lzio.o
-+
-+LUA_LIB_OBJS = lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o ltablib.o \
-+ lstrlib.o loadlib.o loslib.o linit.o
-+
-+LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
-+
-+INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
-+$(LUA_CORE_OBJS): ../lua/src/*.c
-+ $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
-+$(LUA_LIB_OBJS): ../lua/src/lib/*.c
-+ $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
-+CXXFLAGS=$(CXXTFLAGS)
-+else
-+CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
-+endif
-+
-+ifeq ($(shell uname), Darwin)
-+CXXFLAGS:=$(CXXFLAGS) -Dunix
-+endif
-+
-+.cxx.o:
-+ $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< -o $@
-+
-+clean:
-+ rm -f *.o $(PROG)
-+
-+deps:
-+ $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
-+
-+# make should be run in ../../scintilla/gtk to compile all the lexers.
-+COMPLIB=../../scintilla/bin/scintilla.a
-+
-+$(PROG): SciTEGTK.o GUIGTK.o Widget.o \
-+FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
-+PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
-+ JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
-+ $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
-+
-+# Automatically generate header dependencies with "make deps"
-+include deps.mak
-+
-+# The two last install commands will fail if Gnome is not installed or is not at $(prefix).
-+# This is OK - just means no SciTE in the Gnome Applications menu
-+# Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
-+install:
-+ $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(SYSCONF_PATH)
-+
-+ $(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
-+
-+ for files in ../src/*.properties ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png; \
-+ do \
-+ $(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
-+ done
-+
-+ifdef gnomeprefix
-+ $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
-+ $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
-+endif
-+
-+uninstall:
-+ rm -f $(DESTDIR)$(bindir)/SciTE
-+ rm -rf $(DESTDIR)$(SYSCONF_PATH)
-+ifdef gnomeprefix
-+ rm -f $(DESTDIR)$(datadir)/applications/SciTE.desktop
-+ rm -f $(DESTDIR)$(pixmapdir)/Sci48M.png
-+endif
diff -Nru scite-2.25/debian/patches/01_desktop_file.patch scite-3.0.2/debian/patches/01_desktop_file.patch
--- scite-2.25/debian/patches/01_desktop_file.patch 1970-01-01 00:00:00.000000000 +0000
+++ scite-3.0.2/debian/patches/01_desktop_file.patch 2011-12-19 08:41:54.000000000 +0000
@@ -0,0 +1,155 @@
+--- scite-2.25~/scite/gtk/makefile 2011-03-17 23:42:00.000000000 +0100
++++ scite-2.25/scite/gtk/makefile 2011-04-14 12:15:05.601428798 +0200
+@@ -109,7 +109,7 @@
+ done
+
+ ifdef gnomeprefix
+- $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
++ #$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
+ $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ endif
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' scite-2.25~/scite/gtk/makefile.rej scite-2.25/scite/gtk/makefile.rej
+--- scite-2.25~/scite/gtk/makefile.rej 1970-01-01 01:00:00.000000000 +0100
++++ scite-2.25/scite/gtk/makefile.rej 2011-04-14 12:14:14.052576354 +0200
+@@ -0,0 +1,14 @@
++--- scite/gtk/makefile 2004-08-20 10:21:00.000000000 +0200
+++++ tmp/dpep.Px0XCy/scite-1.63/scite/gtk/makefile 2005-05-06 12:29:09.931800784 +0200
++@@ -123,9 +123,9 @@
++
++ ifdef gnomeprefix
++ ifdef GTK2
++- $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
+++# $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
++ else
++- $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop
+++# $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop
++ endif
++ $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
++ endif
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' scite-2.25~/scite/gtk/makefile.~1~ scite-2.25/scite/gtk/makefile.~1~
+--- scite-2.25~/scite/gtk/makefile.~1~ 1970-01-01 01:00:00.000000000 +0100
++++ scite-2.25/scite/gtk/makefile.~1~ 2011-03-17 23:42:00.000000000 +0100
+@@ -0,0 +1,122 @@
++# Make file for SciTE on Linux or compatible OS
++# Copyright 1998-2010 by Neil Hodgson
++# The License.txt file describes the conditions under which this software may be distributed.
++# This makefile assumes GCC 4.x is used and changes will be needed to use other compilers.
++# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
++
++.SUFFIXES: .cxx .o .h .a .c
++ifdef CLANG
++CC = clang
++CCOMP = clang
++else
++CC = g++
++CCOMP = gcc
++endif
++AR = ar
++
++# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
++CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
++CONFIGLIB:=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
++CONFIGTHREADS:=
++gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
++ifndef prefix
++ifdef gnomeprefix
++ prefix=$(gnomeprefix)
++else
++ prefix=/usr
++endif
++endif
++datadir=$(prefix)/share
++pixmapdir=$(datadir)/pixmaps
++bindir=$(prefix)/bin
++SYSCONF_PATH=$(prefix)/share/scite
++
++INSTALL=install
++
++PROG = ../bin/SciTE
++
++all: $(PROG)
++
++vpath %.h ../src ../../scintilla/include
++vpath %.cxx ../src
++
++INCLUDEDIRS=-I ../../scintilla/include -I ../src
++#~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
++CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
++
++ifdef DEBUG
++CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
++else
++CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
++endif
++
++ifndef NO_LUA
++LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
++ lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
++ ltable.o ltm.o lundump.o lvm.o lzio.o
++
++LUA_LIB_OBJS = lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o ltablib.o \
++ lstrlib.o loadlib.o loslib.o linit.o
++
++LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
++
++INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
++$(LUA_CORE_OBJS): ../lua/src/*.c
++ $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
++$(LUA_LIB_OBJS): ../lua/src/lib/*.c
++ $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
++CXXFLAGS=$(CXXTFLAGS)
++else
++CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
++endif
++
++ifeq ($(shell uname), Darwin)
++CXXFLAGS:=$(CXXFLAGS) -Dunix
++endif
++
++.cxx.o:
++ $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< -o $@
++
++clean:
++ rm -f *.o $(PROG)
++
++deps:
++ $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
++
++# make should be run in ../../scintilla/gtk to compile all the lexers.
++COMPLIB=../../scintilla/bin/scintilla.a
++
++$(PROG): SciTEGTK.o GUIGTK.o Widget.o \
++FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
++PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
++ JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
++ $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
++
++# Automatically generate header dependencies with "make deps"
++include deps.mak
++
++# The two last install commands will fail if Gnome is not installed or is not at $(prefix).
++# This is OK - just means no SciTE in the Gnome Applications menu
++# Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
++install:
++ $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(SYSCONF_PATH)
++
++ $(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
++
++ for files in ../src/*.properties ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png; \
++ do \
++ $(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
++ done
++
++ifdef gnomeprefix
++ $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
++ $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
++endif
++
++uninstall:
++ rm -f $(DESTDIR)$(bindir)/SciTE
++ rm -rf $(DESTDIR)$(SYSCONF_PATH)
++ifdef gnomeprefix
++ rm -f $(DESTDIR)$(datadir)/applications/SciTE.desktop
++ rm -f $(DESTDIR)$(pixmapdir)/Sci48M.png
++endif
diff -Nru scite-2.25/debian/patches/02_config.dpatch scite-3.0.2/debian/patches/02_config.dpatch
--- scite-2.25/debian/patches/02_config.dpatch 2012-01-03 03:12:51.000000000 +0000
+++ scite-3.0.2/debian/patches/02_config.dpatch 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
-## 02_config.dpatch by
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad scite-2.03~/scite/src/SciTEGlobal.properties scite-2.03/scite/src/SciTEGlobal.properties
---- scite-2.03~/scite/src/SciTEGlobal.properties 2009-10-20 01:56:05.000000000 +0200
-+++ scite-2.03/scite/src/SciTEGlobal.properties 2010-02-16 21:19:07.666945264 +0100
-@@ -34,12 +34,12 @@
- tabbar.visible=1
- #tabbar.hide.one=1
- #tabbar.multiline=1
--#toolbar.visible=1
-+toolbar.visible=1
- #toolbar.detachable=1
- #toolbar.usestockicons=1
- #menubar.detachable=1
- #undo.redo.lazy=1
--#statusbar.visible=1
-+statusbar.visible=1
- #fileselector.width=800
- #fileselector.height=600
- #fileselector.show.hidden=1
-@@ -238,7 +238,7 @@
- command.scite.help.subsystem=2
- if PLAT_GTK
- command.print.*=a2ps "$(FileNameExt)"
-- command.scite.help=netscape "file://$(SciteDefaultHome)/SciTEDoc.html"
-+ command.scite.help=x-www-browser "file://$(SciteDefaultHome)/SciTEDoc.html"
-
- # Internationalisation
- # Japanese input code page 932 and ShiftJIS character set 128
diff -Nru scite-2.25/debian/patches/02_config.patch scite-3.0.2/debian/patches/02_config.patch
--- scite-2.25/debian/patches/02_config.patch 1970-01-01 00:00:00.000000000 +0000
+++ scite-3.0.2/debian/patches/02_config.patch 2011-12-19 08:41:54.000000000 +0000
@@ -0,0 +1,26 @@
+--- scite-2.03~/scite/src/SciTEGlobal.properties 2009-10-20 01:56:05.000000000 +0200
++++ scite-2.03/scite/src/SciTEGlobal.properties 2010-02-16 21:19:07.666945264 +0100
+@@ -34,12 +34,12 @@
+ tabbar.visible=1
+ #tabbar.hide.one=1
+ #tabbar.multiline=1
+-#toolbar.visible=1
++toolbar.visible=1
+ #toolbar.detachable=1
+ #toolbar.usestockicons=1
+ #menubar.detachable=1
+ #undo.redo.lazy=1
+-#statusbar.visible=1
++statusbar.visible=1
+ #fileselector.width=800
+ #fileselector.height=600
+ #fileselector.show.hidden=1
+@@ -238,7 +238,7 @@
+ command.scite.help.subsystem=2
+ if PLAT_GTK
+ command.print.*=a2ps "$(FileNameExt)"
+- command.scite.help=netscape "file://$(SciteDefaultHome)/SciTEDoc.html"
++ command.scite.help=x-www-browser "file://$(SciteDefaultHome)/SciTEDoc.html"
+
+ # Internationalisation
+ # Japanese input code page 932 and ShiftJIS character set 128
diff -Nru scite-2.25/debian/patches/series scite-3.0.2/debian/patches/series
--- scite-2.25/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ scite-3.0.2/debian/patches/series 2011-12-19 08:41:54.000000000 +0000
@@ -0,0 +1,2 @@
+#01_desktop_file.patch
+#02_config.patch
diff -Nru scite-2.25/debian/rules scite-3.0.2/debian/rules
--- scite-2.25/debian/rules 2012-01-03 03:12:51.000000000 +0000
+++ scite-3.0.2/debian/rules 2011-12-19 08:41:54.000000000 +0000
@@ -1,49 +1,21 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifneq (,$(findstring alpha,$(DEB_HOST_ARCH)))
- BUILD_LUA=NO_LUA=1
-endif
-ifneq (,$(findstring 64,$(DEB_HOST_ARCH)))
- BUILD_LUA=NO_LUA=1
-endif
-ifneq (,$(findstring powerpc,$(DEB_HOST_ARCH)))
- BUILD_LUA=NO_LUA=1
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp: patch
- dh_testdir
+override_dh_auto_build:
+ dh_auto_build
cd scintilla/gtk; $(MAKE) GTK2=1 $(BUILD_LUA)
cd scite/gtk; $(MAKE) gnomeprefix=/usr GTK2=1 $(BUILD_LUA)
- touch build-stamp
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
+override_dh_auto_clean:
+ dh_auto_clean
cd scintilla/gtk; $(MAKE) clean
rm -f scintilla/bin/scintilla.a
cd scite/gtk; $(MAKE) clean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_auto_install:
+ dh_auto_install
cd scite/gtk; $(MAKE) install prefix=../../debian/scite/usr datadir=../../debian/scite/usr/share
chmod -x $(CURDIR)/debian/scite/usr/share/scite/*
mv $(CURDIR)/debian/scite/usr/bin/SciTE $(CURDIR)/debian/scite/usr/bin/scite
@@ -53,39 +25,6 @@
#chmod 644 $(CURDIR)/debian/scite/usr/share/pixmaps/Sci48M.png
#chmod 644 $(CURDIR)/debian/scite/usr/share/gnome/apps/Applications/SciTE.desktop
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installman
- dh_installinfo
+override_dh_installchangelogs:
dh_installchangelogs scintilla/doc/ScintillaHistory.html
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- touch patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff -Nru scite-2.25/debian/source/format scite-3.0.2/debian/source/format
--- scite-2.25/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ scite-3.0.2/debian/source/format 2012-01-03 03:12:52.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru scite-2.25/scintilla/cocoa/InfoBar.mm scite-3.0.2/scintilla/cocoa/InfoBar.mm
--- scite-2.25/scintilla/cocoa/InfoBar.mm 2010-10-27 21:15:45.000000000 +0000
+++ scite-3.0.2/scintilla/cocoa/InfoBar.mm 2011-08-01 02:49:04.000000000 +0000
@@ -46,7 +46,7 @@
//--------------------------------------------------------------------------------------------------
- (void) selectWithFrame: (NSRect) aRect inView: (NSView*) controlView editor: (NSText*) textObj
- delegate:(id) anObject start: (int) selStart length: (int) selLength
+ delegate:(id) anObject start: (NSInteger) selStart length: (NSInteger) selLength
{
aRect = [self drawingRectForBounds: aRect];
mIsEditingOrSelecting = YES;
diff -Nru scite-2.25/scintilla/cocoa/PlatCocoa.h scite-3.0.2/scintilla/cocoa/PlatCocoa.h
--- scite-2.25/scintilla/cocoa/PlatCocoa.h 2010-10-27 21:15:45.000000000 +0000
+++ scite-3.0.2/scintilla/cocoa/PlatCocoa.h 2011-09-26 11:41:36.000000000 +0000
@@ -23,6 +23,7 @@
NSRect PRectangleToNSRect(Scintilla::PRectangle& rc);
Scintilla::PRectangle NSRectToPRectangle(NSRect& rc);
+CFStringEncoding EncodingFromCharacterSet(bool unicode, int characterSet);
@interface ScintillaContextMenu : NSMenu
{
@@ -47,14 +48,17 @@
/** The text layout instance */
QuartzTextLayout* textLayout;
+ int codePage;
+ int verticalDeviceResolution;
+
/** If the surface is a bitmap context, contains a reference to the bitmap data. */
uint8_t* bitmapData;
/** If the surface is a bitmap context, stores the dimensions of the bitmap. */
int bitmapWidth;
int bitmapHeight;
- /** Set the CGContext's fill colour to the specified allocated colour. */
- void FillColour( const ColourAllocated& back );
+ /** Set the CGContext's fill colour to the specified desired colour. */
+ void FillColour( const ColourDesired& back );
// 24-bit RGB+A bitmap data constants
@@ -72,7 +76,7 @@
void Release();
bool Initialised();
- void PenColour(ColourAllocated fore);
+ void PenColour(ColourDesired fore);
/** Returns a CGImageRef that represents the surface. Returns NULL if this is not possible. */
CGImageRef GetImage();
@@ -82,36 +86,36 @@
int DeviceHeightFont(int points);
void MoveTo(int x_, int y_);
void LineTo(int x_, int y_);
- void Polygon(Scintilla::Point *pts, int npts, ColourAllocated fore, ColourAllocated back);
- void RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back);
- void FillRectangle(PRectangle rc, ColourAllocated back);
+ void Polygon(Scintilla::Point *pts, int npts, ColourDesired fore, ColourDesired back);
+ void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back);
+ void FillRectangle(PRectangle rc, ColourDesired back);
void FillRectangle(PRectangle rc, Surface &surfacePattern);
- void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back);
- void AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill,
- ColourAllocated outline, int alphaOutline, int flags);
- void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back);
+ void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back);
+ void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill, int alphaFill,
+ ColourDesired outline, int alphaOutline, int flags);
+ void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage);
+ void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back);
void Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSource);
- void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore,
- ColourAllocated back);
- void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore,
- ColourAllocated back);
- void DrawTextTransparent(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore);
- void MeasureWidths(Font &font_, const char *s, int len, int *positions);
- int WidthText(Font &font_, const char *s, int len);
- int WidthChar(Font &font_, char ch);
- int Ascent(Font &font_);
- int Descent(Font &font_);
- int InternalLeading(Font &font_);
- int ExternalLeading(Font &font_);
- int Height(Font &font_);
- int AverageCharWidth(Font &font_);
+ void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore,
+ ColourDesired back);
+ void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore,
+ ColourDesired back);
+ void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore);
+ void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions);
+ XYPOSITION WidthText(Font &font_, const char *s, int len);
+ XYPOSITION WidthChar(Font &font_, char ch);
+ XYPOSITION Ascent(Font &font_);
+ XYPOSITION Descent(Font &font_);
+ XYPOSITION InternalLeading(Font &font_);
+ XYPOSITION ExternalLeading(Font &font_);
+ XYPOSITION Height(Font &font_);
+ XYPOSITION AverageCharWidth(Font &font_);
- int SetPalette(Scintilla::Palette *pal, bool inBackGround);
void SetClip(PRectangle rc);
void FlushCachedState();
void SetUnicodeMode(bool unicodeMode_);
- void SetDBCSMode(int codePage);
+ void SetDBCSMode(int codePage_);
}; // SurfaceImpl class
} // Scintilla namespace
diff -Nru scite-2.25/scintilla/cocoa/PlatCocoa.mm scite-3.0.2/scintilla/cocoa/PlatCocoa.mm
--- scite-2.25/scintilla/cocoa/PlatCocoa.mm 2011-03-17 22:41:24.000000000 +0000
+++ scite-3.0.2/scintilla/cocoa/PlatCocoa.mm 2011-12-08 22:17:01.000000000 +0000
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
Folding
@@ -841,11 +841,18 @@
c:\os\scite\bin\Lua.properties.
+ All of the properties files in a directory can be imported with "import *".
+ This does not import generic properties files like user properties or abbreviations.
+ The set of files that are imported can be controlled with the imports.include and imports.exclude
+ properties.
+
+
The 'if' statement takes one argument which is a
symbol that may be defined earlier in this property set file or in a base
property set. If the symbol evaluates to '0' then the test fails. An empty
string or not present symbol evaluates to 0. Into the very top property set
- is inserted one of 'PLAT_GTK' with value '1' or 'PLAT_WIN' with value '1'.
+ is inserted one of 'PLAT_GTK' with value '1',
+ 'PLAT_WIN' with value '1', or 'PLAT_MAC' with value '1'.
If the test succeeds then following indented statements are executed. When a
non-indented statement is found the if clause is finished. Only simple set
statements are allowed in if clauses. The evaluation of if statements occurs
@@ -932,7 +939,7 @@
global properties files. So after changing it, restart SciTE to see the effect.
-
+
buffers.zorder.switching
|
@@ -1023,10 +1030,9 @@
depends on your platform.
You can overwrite this behaviour by setting the property to
- LF for UNIX format
- CR for Macintosh format
+ LF for UNIX and OS X format
+ CR for Macintosh format prior to OS X
CRLF for DOS/Windows format
- As you see, Windows combines the best of the other worlds ;-)
@@ -1094,13 +1100,19 @@
- tabbar.visible
- tabbar.hide.one
+ tabbar.visible
|
- Setting tabbar.visible to 1 makes the tab bar visible at start up on Windows.
- The buffers property must be set to a value greater than 1 for this option to work.
- Setting tabbar.hide.one to 1 hides the tab bar until there is more than one tab.
+ Setting tabbar.visible to 1 makes the tab bar visible at start up.
+ The buffers property must be set to a value greater than 1 for this option to work.
+ |
+
+
+
+ tabbar.hide.one
+ |
+
+ Setting tabbar.hide.one to 1 hides the tab bar until there is more than one tab.
|
@@ -1146,14 +1158,6 @@
Setting pathbar.visible to 1 makes the path bar visible on GTK+.
-
-
- menubar.detachable
- |
-
- Setting this to 1 makes the menu bar detachable from the main window.
- |
-
undo.redo.lazy
@@ -1171,10 +1175,10 @@
Setting this to 1 makes the status bar visible at start up.
|
-
+
statusbar.number
- statusbar.text.number
+ statusbar.text.number
|
The statusbar.text.1 option defines the information displayed in the status bar
@@ -1187,21 +1191,9 @@
You can also use file properties, which, unlike those above, are not updated
on each keystroke: FileName or FileNameExt, FileDate and FileTime and
FileAttr. Plus CurrentDate and CurrentTime.
- On Windows only, further texts may be set as statusbar.text.2 .. and these may be
+ On Windows only, further texts may be set as statusbar.text.2 .. and these may be
cycled between by clicking the status bar.
- The statusbar.number option defines how many texts are to be cycled through.
- |
-
-
-
- use.palette
- |
-
- Setting this to 1 makes SciTE use a palette to enable it to display more colours on 8 bit
- displays. Without this option SciTE will only display with colours already available
- which is normally the 20 colour Windows system palette. The downside of turning on this
- option is that there will be some flashing as windows are activated. This option has no
- effect on GTK+ where a palette is always used.
+ The statusbar.number option defines how many texts are to be cycled through.
|
@@ -1231,6 +1223,15 @@
unless buffered drawing is on. The default is for drawing to be two phase.
+
+
+ technology
+ |
+
+ On Windows Vista or newer, this can be set to 1 to use the Direct2D and DirectWrite APIs
+ for higher quality antialiased drawing. The default is 0.
+ |
+
load.on.activate
@@ -1291,6 +1292,34 @@
|
+ background.open.size
+ background.save.size
+ |
+
+ This setting controls whether files are opened and saved without blocking the user interface
+ while they are being read or written.
+ Files larger than the given size in bytes will be read or written in the background while
+ smaller files will be read or written directly and SciTE will not respond until the file access is completed.
+ The default value is -1 allows background processing for all files.
+ For saving, the size used is the in-memory size in bytes which will differ from the on-disk size
+ when the UTF-16 encoding is used.
+ |
+
+
+
+ temp.files.sync.load
+ |
+
+ Files dropped on SciTE on Windows are normally opened asynchronously
+ as there may be a long list. However, files dragged from some applications
+ such as 7-Zip may only exist for a moment in the temporary directory and
+ be deleted once the drop has occurred.
+ Setting this to 1 makes SciTE open dropped files in the temporary directory
+ immediately.
+ |
+
+
+
quit.on.close.last
|
@@ -1300,6 +1329,28 @@
last buffer is closed.)
|
+
+
+ highlight.current.word
+ |
+
+ When set to 1, all occurrences of the selected word are highlighted with the
+ colour defined by highlight.current.word.colour. By default, this option is disabled. (See indicators.alpha and indicators.under)
+ |
+
+
+
+ highlight.current.word.colour
+ highlight.current.word.by.style
+ |
+
+ The option highlight.current.word.colour defines the colour of highlight.
+ The default value is #A0A000.
+ If the option highlight.current.word.by.style is set, then only words with the same style
+ are highlighted (e.g. if you select this word in a comment, then only occurrences of words in
+ comments are selected).
+ |
+
rectangular.selection.modifier
@@ -1496,6 +1547,21 @@
|
+ error.inline
+ style.error.0
+ style.error.1
+ style.error.2
+ style.error.3
+ |
+
+ To see error messages interspersed with the source code, set error.inline=1.
+ Different visual styles are used for different severities: style.error.0 is the default;
+ style.error.1 for warnings; style.error.2 for errors; and style.error.3 for fatal errors.
+ The severity of a message is inferred from finding the text "warning", "error", or "fatal" in the message.
+ |
+
+
+
bookmark.fore
bookmark.back
bookmark.alpha
@@ -1512,7 +1578,25 @@
|
If set, then the Mark All command in the Find dialog will draw translucent boxes over
- each string found.
+ each string found. (See indicators.alpha and indicators.under)
+ |
+
+
+
+ indicators.alpha
+ |
+
+ This property defines the alpha level for indicators (default value is 30).
+ The alpha value can range from 0 (completely transparent) to 255 (no transparency).
+ A value out of this range is ignored and the default one is used.
+ |
+
+
+
+ indicators.under
+ |
+
+ If set, the indicators are drawn under text or over (by default, it is over).
|
@@ -1533,7 +1617,7 @@
Defines a path for the Open Selected Filename command in the File
menu. The path is searched if the selected filename doesn't contain an
absolute path or the file is not found in the document directory. The
- directories in openpath are separated by ';' on Windows and ':' on GTK+.
+ directories in openpath are separated by ';' on Windows and ':' on OS X and GTK+.
An openpath setting may look like:
openpath.*.txt=c:\dos\;f:\;
@@ -1808,10 +1892,6 @@
| This option enables folding multi-line comments and explicit fold points when using the C++ lexer. Explicit fold points allows adding extra folding by placing a //{ comment at the start and a //} at the end of a section that should fold. |
- fold.comment.python |
- This option enables folding multi-line comments when using the Python lexer. |
-
-
fold.cpp.comment.explicit |
Set this property to 0 to disable folding explicit fold points when fold.comment=1. |
@@ -1876,12 +1956,20 @@
Allow folding for heredocs in scripts embedded in HTML. The default is off. |
+ fold.perl.at.else |
+ This option enables Perl folding on a "} else {" line of an if statement. |
+
+
+ fold.perl.comment.explicit |
+ Set to 0 to disable explicit folding. |
+
+
fold.perl.package |
- Enable folding packages when using the Perl lexer. |
+ Set to 0 to disable folding packages when using the Perl lexer. |
fold.perl.pod |
- Enable folding Pod blocks when using the Perl lexer. |
+ Set to 0 to disable folding Pod blocks when using the Perl lexer. |
fold.preprocessor |
@@ -1892,6 +1980,10 @@
This option enables folding multi-line quoted strings when using the Python lexer. |
+ fold.sql.at.else |
+ This option enables SQL folding on a "ELSE" and "ELSIF" line of an IF statement. |
+
+
html.tags.case.sensitive |
For XML and HTML, setting this property to 1 will make tags match in a case sensitive way which is the expected behaviour for XML and XHTML. |
@@ -1904,10 +1996,18 @@
Set to 0 to disallow the '$' character in identifiers with the cpp lexer. |
+ lexer.cpp.hashquoted.strings |
+ Set to 1 to enable highlighting of hash-quoted strings. |
+
+
lexer.cpp.track.preprocessor |
Set to 1 to interpret #if/#else/#endif to grey out code that is not active. |
+ lexer.cpp.triplequoted.strings |
+ Set to 1 to enable highlighting of triple-quoted strings. |
+
+
lexer.cpp.update.preprocessor |
Set to 1 to update preprocessor definitions when #define found. |
@@ -1936,6 +2036,10 @@
For properties files, set to 0 to style all lines that start with whitespace in the default style. This is not suitable for SciTE .properties files which use indentation for flow control but can be used for RFC2822 text where indentation is used for continuation lines. |
+ lexer.python.keywords2.no.sub.identifiers |
+ When enabled, it will not style keywords2 items that are used as a sub-identifier. Example: when set, will not highlight "foo.open" when "open" is a keywords2 item. |
+
+
lexer.python.literals.binary |
Set to 0 to not recognise Python 3 binary and octal literals: 0b1011 0o712. |
@@ -1956,10 +2060,6 @@
Set to 1 to colourise recognized words with dots (recommended for Oracle PL/SQL objects). |
- lexer.sql.fold.at.else |
- This option enables SQL folding on a "ELSE" and "ELSIF"line of an IF statement. |
-
-
lexer.sql.numbersign.comment |
If "lexer.sql.numbersign.comment" property is set to 0 a line beginning with '#' will not be a comment. |
@@ -2196,7 +2296,6 @@
items out, one per line. These file types appear in the "Files of type:" pull down. The
first item is the default, so you may wish to change the first item to include the file
types you commonly open.
- On GTK+, this option only works for GTK+ 2.4 or later.
@@ -2228,7 +2327,7 @@
save.deletes.first
- Causes files to be deleted before being opened for saving. Can be used on Windows
+ Causes files to be deleted before being opened for saving. Can be used
to ensure saving under a different capitalisation changes the files capitalisation rather
than silently using the old capitalisation.
|
@@ -2284,10 +2383,7 @@
Setting open.dialog.in.file.directory causes the open dialog to initially
display the same directory as the current file. If it is not set then the
- system default is used which on Windows XP is the last directory
- visited by the open dialog in any instance of SciTE. This is hard
- to use with multiple instances of SciTE.
- Some versions of GTK+ may also set an unexpected directory.
+ system default is used.
|
@@ -2456,8 +2552,8 @@
Setting code.page to 65001 starts Unicode mode and the document is treated as
a sequence of characters expressed as UTF-8. Display is performed by converting to the
platform's normal Unicode encoding first so characters from any language will be displayed.
- Correct glyphs will only be displayed if fonts are chosen that contain the appropriate glyphs.
- Tahoma is a good choice on Windows XP.
+ Correct glyphs may only be displayed if fonts are chosen that contain the appropriate glyphs.
+ The Tahoma font contains a wide range of glyphs so may be a good choice.
This property can not set a single byte character set.
If output.code.page is set then it is used for the output pane which otherwise
matches the edit pane.
@@ -2489,10 +2585,47 @@
Cyrillic (CP1251 on GTK+) | 1251 |
European with Euro (ISO 8859-15) | 1000 |
- All of these values except for 1251 and 1000 may work on Windows, but on GTK+ Baltic, Turkish, Thai and Vietnamese
- will probably not work.
- Please send email if you use one of these settings and it works or doesn't or if you
- have information on how to support other languages.
+ All of these values except for 1251 and 1000 should work on OS X or Windows.
+ On GTK+ Baltic, Turkish, Thai and Vietnamese will probably not work.
+
+
+
+
+ imports.include
+ imports.exclude
+ |
+
+ These settings control which files are imported by import statements.
+ The imports.include property defines the names of the properties
+ files that may be imported. Say you are only interested in using
+ fortran and lisp, then in user properties, you could set
+
+imports.include=fortran lisp
+
+ The imports.exclude property is examined only if imports.include is empty or missing.
+ This property stops the named files from being imported.
+ |
+
+
+
+ command.discover.properties
+ |
+
+ This property can be used to run a program to determine file encoding and other properties
+ when a file is loaded.
+ The program should print a list of property=value lines for each property it wants to set.
+ This is the same format as properties files.
+
+ command.discover.properties=python /home/user/FileDetect.py "$(FilePath)"
+
+ A simple Python script that recognises a particular tag that indicates the file is in the Korean code page 949:
+
+import sys
+if "Language:Korean" in open(sys.argv[1]).read():
+ print('code.page=949')
+ print('character.set=129')
+
+
|
@@ -2648,16 +2781,18 @@
each lexer.
The value of each setting is a set of ',' separated fields, some of which have a
subvalue after a ':'. The fields are font, size, fore, back, italics, notitalics, bold,
- notbold, eolfilled, noteolfilled, underlined, notunderlined, and case.
+ notbold, weight, eolfilled, noteolfilled, underlined, notunderlined, and case.
The font field has a subvalue which is the name of
- the font, the fore and back have colour subvalues, the size field has a numeric size
- subvalue, the case field has a subvalue of 'm', 'u', or 'l' for mixed, upper or lower case,
- and the bold, italics and eolfilled fields have no subvalue. The value
+ the font, the fore and back have colour subvalues,
+ the size field has a (fractional) numeric size subvalue,
+ the weight field has a numeric size subvalue (1.. 999: 100=light, 400=normal, 700=bold),
+ the case field has a subvalue of 'm', 'u', or 'l' for mixed, upper or lower case,
+ and the bold, italics and eolfilled fields have no subvalue. The value
"fore:#FF0000,font:Courier,size:14" represents 14 point, red Courier text.
A global style can be set up using style.*.stylenumber. Any style options set in
the global style will be inherited by each lexer style unless overridden.
- On GTK+ 2, Pango anti-aliased fonts can be chosen by prefixing the font name with "!",
- such as "font:!Sans".
+ On GTK+, the font name should be prefixed with "!" such as "font:!Sans" to ensure Pango
+ anti-aliased fonts are used. If this is not done, an older font system will be used which may not work well.
@@ -2729,8 +2864,7 @@
These settings choose which commands to execute when the Compile, Build or Go menu items
- are selected. The subsystem options determine for Windows whether the tools are run as
- command line(0), windowed(1), through ShellExecute(2), or through the director interface(3).
+ are selected. The subsystem options are explained in the subsystem section.
When source files are in a different directory to that they should be built in, the
command.build.directory property can be set to change to a particular directory before performing
the build.
@@ -2855,7 +2989,7 @@
|
Defines a command to be executed when the help command is
invoked or F1 pressed. On Windows, this often uses subsystem 4 as described above.
- On Linux, running man or a browser are common ways of displaying help.
+ On OS X or Linux, running man or a browser are common ways of displaying help.
The word at the cursor is copied to $(CurrentWord) and this is often a good argument
to the help application. The subsystem property works in the same way as for other
commands.
@@ -2877,7 +3011,8 @@
command.print.subsystem.filepattern
|
- Defines a command to be executed when print is invoked on GTK+.
+ Defines a command to be executed when print is invoked on GTK+ 2.x.
+ On Windows and GTK+ 3.x, printing is performed directly by SciTE.
|
@@ -2888,7 +3023,7 @@
When a command is completed, print the time it took in seconds.
-
+
print.magnification
|
@@ -2899,7 +3034,7 @@
good miniaturisation of text, set print.magnification to -4.
-
+
print.colour.mode
|
@@ -2922,7 +3057,7 @@
This property is only read at start up.
-
+
print.header.format
print.footer.format
@@ -2940,7 +3075,7 @@
|
-
+
print.header.style
print.footer.style
@@ -3118,6 +3253,24 @@
|
+ fold.highlight
+ |
+
+ Set to 1 to enable highlight for current folding block (smallest one that contains the caret).
+ By default, it's disable. Note : The highlight is enabled only when fold.symbols equals
+ to 2 (round headers) or 3 (square headers).
+ |
+
+
+
+ fold.highlight.colour
+ |
+
+ Define the colour of highlight. The colour by default is red (#FF0000).
+ |
+
+
+
title.full.path
|
@@ -3228,6 +3381,26 @@
|
+ indent.python.colon
+ |
+
+ For Python, automatically indent by one level if the previous line ended in a ':'
+ ignoring comments and whitespace. Otherwise use the same indentation as the previous line.
+ This property overrides other indentation settings.
+ |
+
+
+
+ os.x.home.end.keys
+ |
+
+ Chooses the standard OS X behaviour for the Home and End keys which is
+ to scroll the file to the start or end. This setting takes precedence over
+ vc.home.key.
+ |
+
+
+
vc.home.key
|
@@ -3273,18 +3446,9 @@
fileselector.height
|
- For the GTK+ version determines the initial size of the file
- selector dialog invoked by the Open and Save commands.
- Setting has no effect on Windows.
- |
-
-
-
- fileselector.show.hidden
- |
-
- On GTK+ setting this to 1 makes the file selector dialog
- invoked by the Open command show hidden files automatically.
+ For the GTK+ version determines the initial size of the file
+ selector dialog invoked by the Open and Save commands.
+ Setting has no effect on Windows.
|
diff -Nru scite-2.25/scite/doc/SciTEDownload.html scite-3.0.2/scite/doc/SciTEDownload.html
--- scite-2.25/scite/doc/SciTEDownload.html 2011-03-20 22:45:33.000000000 +0000
+++ scite-3.0.2/scite/doc/SciTEDownload.html 2011-12-08 22:16:52.000000000 +0000
@@ -30,9 +30,9 @@
-
+
Windows
-
+
GTK+/Linux
|
@@ -45,7 +45,7 @@
containing very few restrictions.
- Release 2.25
+ Release 3.0.2
Source Code
@@ -53,8 +53,8 @@
The source code package contains all of the source code for Scintilla and SciTE but no binary
executable code and is available in
- - zip format (2100K) commonly used on Windows
- - tgz format (1880K) commonly used on Linux and compatible operating systems
+ - zip format (2100K) commonly used on Windows
+ - tgz format (1880K) commonly used on Linux and compatible operating systems
Instructions for building on both Windows and Linux are included in the readme file.
@@ -68,13 +68,13 @@
is no longer tested.
- A full download (1000K) includes the SciTE executable, any required DLLs,
+ A full download (1000K) includes the SciTE executable, any required DLLs,
configuration files and documentation. After downloading the file, unzip it, and run
SciTE.EXE. The files required to run SciTE are SciTE.EXE, SciLexer.DLL, and
SciTEGlobal.properties.
- A single file executable called Sc1 (620K) does not need any DLL or
+ A single file executable called Sc1 (640K) does not need any DLL or
properties files as these are linked into the executable. You may still create properties
files if you wish.
Sc1.exe has been compressed with the
@@ -92,15 +92,16 @@
GTK+ / Linux
- Linux executable for Intel compatible processors
+ Linux executable for 32-bit Intel compatible processors
- This binary release requires GTK+ 2.8 or later and was tested on Fedora 13.
+ This binary release requires GTK+ 2.8 or later and was tested on Ubuntu 10.4.
If you are using a Linux distribution more than a year old you may
need to rebuild SciTE to use your installed version of GTK+.
+ If the target system is 64-bit, you may also need to build SciTE from source.
- A full download (900K) includes the SciTE executable,
+ A full download (920K) includes the 32-bit SciTE executable,
configuration files and documentation.
After downloading the file, gunzip and untar it, and run
SciTE. The files required to run SciTE are SciTE which is best located on the path
diff -Nru scite-2.25/scite/doc/SciTE.html scite-3.0.2/scite/doc/SciTE.html
--- scite-2.25/scite/doc/SciTE.html 2011-03-20 22:45:33.000000000 +0000
+++ scite-3.0.2/scite/doc/SciTE.html 2011-12-08 22:16:52.000000000 +0000
@@ -9,7 +9,7 @@
-
+