From dfe7515c93d752656369cc10b515bf4e1608c48c Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Thu, 31 Dec 2009 15:48:38 +0000 Subject: [PATCH] Additional, official changes from the new SynEdit repository at SF: https://synedit.svn.sourceforge.net/svnroot/synedit --- components/synedit/Source/SynEdit.pas | 4 +++- components/synedit/Source/SynEditSearch.pas | 10 ++++++---- components/synedit/Source/SynHighlighterProgress.pas | 10 +++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/components/synedit/Source/SynEdit.pas b/components/synedit/Source/SynEdit.pas index 43a4baae..1bc2d541 100644 --- a/components/synedit/Source/SynEdit.pas +++ b/components/synedit/Source/SynEdit.pas @@ -7448,7 +7448,9 @@ begin CommandProcessor(ecTab, #0, nil) else CommandProcessor(ecChar, SpaceBuffer[i], nil); - end; + end + else + InternalCaretXY := BufferCoord(1, CaretY +1); end; fUndoList.AddChange(crLineBreak, Caret, Caret, '', smNormal); end; diff --git a/components/synedit/Source/SynEditSearch.pas b/components/synedit/Source/SynEditSearch.pas index 8d9f634b..5a3f620d 100644 --- a/components/synedit/Source/SynEditSearch.pas +++ b/components/synedit/Source/SynEditSearch.pas @@ -28,7 +28,7 @@ replace them with the notice and other provisions required by the GPL. If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the GPL. -$Id: SynEditSearch.pas,v 1.12.2.4 2008/09/14 16:24:59 maelh Exp $ +$Id: SynEditSearch.pas,v 1.12.2.6 2009/09/29 00:16:46 maelh Exp $ You may retrieve the latest version of this file at the SynEdit home page, located at http://SynEdit.SourceForge.net @@ -72,6 +72,7 @@ type fWhole: Boolean; fResults: TList; fShiftInitialized: Boolean; + FTextToSearch: UnicodeString; function GetFinished: Boolean; procedure InitShiftTable; procedure SetCaseSensitive(const Value: Boolean); @@ -253,7 +254,7 @@ begin Pat := CasedPat else Pat := SynWideLowerCase(CasedPat); - fShiftInitialized := True; + fShiftInitialized := False; end; end; @@ -286,9 +287,10 @@ begin if fTextLen >= PatLen then begin if CaseSensitive then - Origin := PWideChar(NewText) + FTextToSearch := NewText else - Origin := PWideChar(SynWideLowerCase(NewText)); + FTextToSearch := SynWideLowerCase(NewText); + Origin := PWideChar(FTextToSearch); TheEnd := Origin + fTextLen; Run := (Origin - 1); Result := Next; diff --git a/components/synedit/Source/SynHighlighterProgress.pas b/components/synedit/Source/SynHighlighterProgress.pas index 7450686a..66a50b2a 100644 --- a/components/synedit/Source/SynHighlighterProgress.pas +++ b/components/synedit/Source/SynHighlighterProgress.pas @@ -27,7 +27,7 @@ replace them with the notice and other provisions required by the GPL. If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the GPL. -$Id: SynHighlighterProgress.pas,v 1.16.2.7 2009/09/28 17:54:20 maelh Exp $ +$Id: SynHighlighterProgress.pas,v 1.16.2.8 2009/09/28 19:16:08 maelh Exp $ You may retrieve the latest version of this file at the SynEdit home page, located at http://SynEdit.SourceForge.net @@ -298,7 +298,7 @@ const 'com8 com9 combo-box command complete ' + 'com-self con connect connected ' + 'constrained contains contents context context-popup ' + - 'control-container convert convert-3d-colors convert-to-offset count ' + + 'control-container convert convert-3d-colors convert-to-offset count copy-lob ' + 'cpcase cpcoll cpinternal cplog cpprint ' + 'cprcodein cprcodeout cpterm crc-value create-control ' + 'create-result-list-entry create-test-file current_date current-column ' + @@ -315,8 +315,8 @@ const 'eq error error-col error-column error-row ' + 'events event-type exp expand extended ' + 'extent external extract fetch-selected-row fgc ' + - 'fgcolor file filename file-name ' + - 'file-offset file-type filled fill-in filters ' + + 'fgcolor file filename file-create-date file-create-time file-mod-date file-mod-time file-name ' + + 'file-offset file-size file-type filled fill-in filters ' + 'first-child first-column first-proc first-procedure first-server ' + 'first-tab-item fixed-only focused-row font-table force-file ' + 'foreground forwards frame-spacing frame-x frame-y ' + @@ -337,7 +337,7 @@ const 'image-size-pixels image-up immediate-display indexed-reposition index-hint ' + 'info information init initial initial-dir ' + 'initial-filter initiate inner inner-chars inner-lines input-value ' + - 'insert-backtab insert-file insert-row insert-string insert-tab ' + + 'insert-backtab insert-file insert-row insert-string insert-tab instantiating-procedure ' + 'internal-entries is-lead-byte is-row-selected is-selected item ' + 'items-per-row join-by-sqldb keep-frame-z-order keep-messages keep-tab-order ' + 'key keyword-all label-bgc label-bgcolor label-dc ' +