Fix for paster-keystroke: should insert character at the end of the just pasted selection,
--- a/EditTextView.st Fri Aug 30 18:02:56 2013 +0100
+++ b/EditTextView.st Fri Aug 30 20:20:43 2013 +0100
@@ -5280,8 +5280,17 @@
key := keyArg.
typeOfSelection == #paste ifTrue:[
- "pasted selection will NOT be replaced by keystroke"
- self unselect
+ "Pasted selection will NOT be replaced by keystroke (non-standard, St/X feature)"
+
+ "/ After paste, the cursor is at the beginning to support
+ "/ paste-cursordown-paste. Compensate for this here - we want
+ "/ to continue editing after the end of the selection.
+ "/ This is
+ cursorLine := selectionEndLine.
+ cursorCol := selectionEndCol + 1.
+
+ "/ Cursor position set, we can unselect.
+ self unselect.
].
selStartLine := selectionStartLine.
@@ -5383,6 +5392,7 @@
self handleCompletionService
"Modified (comment): / 25-01-2012 / 00:30:11 / cg"
+ "Modified: / 30-08-2013 / 20:10:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
keyPress:key x:x y:y
--- a/libInit.cc Fri Aug 30 18:02:56 2013 +0100
+++ b/libInit.cc Fri Aug 30 20:20:43 2013 +0100
@@ -1,5 +1,5 @@
/*
- * $Header: /cvs/stx/stx/libwidg/libInit.cc,v 1.29 2013-02-22 12:36:34 cg Exp $
+ * $Header$
*
* DO NOT EDIT
* automagically generated from the projectDefinition: stx_libwidg.
--- a/libwidg.rc Fri Aug 30 18:02:56 2013 +0100
+++ b/libwidg.rc Fri Aug 30 20:20:43 2013 +0100
@@ -3,8 +3,8 @@
// automagically generated from the projectDefinition: stx_libwidg.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,1,30
- PRODUCTVERSION 6,2,2,0
+ FILEVERSION 6,2,32767,32767
+ PRODUCTVERSION 6,2,3,0
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Elementary Widgets (LIB)\0"
- VALUE "FileVersion", "6.2.1.30\0"
+ VALUE "FileVersion", "6.2.32767.32767\0"
VALUE "InternalName", "stx:libwidg\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
VALUE "ProductName", "Smalltalk/X\0"
- VALUE "ProductVersion", "6.2.2.0\0"
- VALUE "ProductDate", "Fri, 22 Feb 2013 12:36:14 GMT\0"
+ VALUE "ProductVersion", "6.2.3.0\0"
+ VALUE "ProductDate", "Fri, 30 Aug 2013 19:19:56 GMT\0"
END
END
--- a/mingwmake.bat Fri Aug 30 18:02:56 2013 +0100
+++ b/mingwmake.bat Fri Aug 30 20:20:43 2013 +0100
@@ -3,8 +3,14 @@
@REM type mingwmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
+@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
-@call ..\rules\find_mingw.bat
-make.exe -N -f bc.mak %USEMINGW_ARG% %*
+@pushd ..\rules
+@call find_mingw.bat
+@popd
+make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
--- a/vcmake.bat Fri Aug 30 18:02:56 2013 +0100
+++ b/vcmake.bat Fri Aug 30 20:20:43 2013 +0100
@@ -5,8 +5,16 @@
@REM -------
@if not defined VSINSTALLDIR (
- call ..\rules\vcsetup.bat
+ pushd ..\rules
+ call vcsetup.bat
+ popd
)
-make.exe -N -f bc.mak -DUSEVC %*
+@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
+
+