Revision: 4781 http://geany.svn.sourceforge.net/geany/?rev=4781&view=rev Author: eht16 Date: 2010-03-20 15:40:45 +0000 (Sat, 20 Mar 2010)
Log Message: ----------- Backport fix from Scintilla CVS to not paste text beyond the end of lines (closes #2969096).
Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/ScintillaGTK.cxx
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-03-20 15:27:09 UTC (rev 4780) +++ trunk/ChangeLog 2010-03-20 15:40:45 UTC (rev 4781) @@ -2,12 +2,15 @@
* src/win32.c: Make CreateChildProcess() working with Unicode strings, e.g. - directory names (closes 2972606). + directory names (closes #2972606). * geany.nsi: Remove reference to already removed latex.tags file. Future releases probably still depend on GTK 2.16. - + * scintilla/ScintillaGTK.cxx: + Backport fix from Scintilla CVS to not paste text beyond the end + of lines (closes #2969096).
+ 2010-03-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/stash.c:
Modified: trunk/scintilla/ScintillaGTK.cxx =================================================================== --- trunk/scintilla/ScintillaGTK.cxx 2010-03-20 15:27:09 UTC (rev 4780) +++ trunk/scintilla/ScintillaGTK.cxx 2010-03-20 15:40:45 UTC (rev 4781) @@ -1001,8 +1001,8 @@ }
bool ScintillaGTK::ValidCodePage(int codePage) const { - return codePage == 0 - || codePage == SC_CP_UTF8 + return codePage == 0 + || codePage == SC_CP_UTF8 || codePage == 932 || codePage == 936 || codePage == 950 @@ -1038,10 +1038,10 @@ case SCI_SETRECTANGULARSELECTIONMODIFIER: rectangularSelectionModifier = wParam; break; - + case SCI_GETRECTANGULARSELECTIONMODIFIER: return rectangularSelectionModifier; - + default: return ScintillaBase::WndProc(iMessage, wParam, lParam); } @@ -1817,7 +1817,7 @@ return GDK_MOD1_MASK; case SCMOD_SUPER: return GDK_MOD4_MASK; - default: + default: return 0; } } @@ -1854,7 +1854,7 @@ (event->state & modifierTranslated(rectangularSelectionModifier)) != 0); } else if (event->button == 2) { // Grab the primary selection if it exists - SelectionPosition pos = SPositionFromLocation(pt); + SelectionPosition pos = SPositionFromLocation(pt, false, false, UserVirtualSpace()); if (OwnPrimarySelection() && primary.s == NULL) CopySelectionRange(&primary);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.