mirror of https://gitlab.com/basile.b/dexed.git
fix more runtime error due to fix for #307
+ mixed indent dialog could be shown during tab switch, w/o doc visible yet
This commit is contained in:
parent
dc9f2fed64
commit
15c9325c0e
|
@ -84,5 +84,5 @@ object CurrentProject: TCENativeProject
|
|||
'cesetup.d'
|
||||
)
|
||||
ConfigurationIndex = 2
|
||||
version = '3.6.10'
|
||||
version = '3.6.11'
|
||||
end
|
||||
|
|
|
@ -1 +1 @@
|
|||
v3.6.10
|
||||
v3.6.11
|
||||
|
|
|
@ -1137,8 +1137,9 @@ end;
|
|||
procedure TCESynMemo.handleModalBeginning(sender: TObject);
|
||||
begin
|
||||
// AV can happens in TCustomSynEdit.UpdateCursor
|
||||
if assigned(FTextArea) and (eoAutoHideCursor in Options2) then
|
||||
MouseMove([], 0, 0);
|
||||
if (self <> nil) and (Pcardinal(@FTextArea)^ <> $f0f0f0f0) and (Pcardinal(@FTextArea)^ <> $0f0f0f0f)
|
||||
and assigned(FTextArea) and (eoAutoHideCursor in Options2) then
|
||||
MouseMove([], 0, 0);
|
||||
end;
|
||||
|
||||
procedure TCESynMemo.setFocus;
|
||||
|
@ -1146,7 +1147,6 @@ begin
|
|||
inherited;
|
||||
highlightCurrentIdentifier;
|
||||
subjDocFocused(TCEMultiDocSubject(fMultiDocSubject), self);
|
||||
tryToPatchMixedIndentation;
|
||||
end;
|
||||
|
||||
procedure TCESynMemo.showPage;
|
||||
|
@ -1162,6 +1162,7 @@ begin
|
|||
subjDocFocused(TCEMultiDocSubject(fMultiDocSubject), self);
|
||||
fFocusForInput := true;
|
||||
fScrollMemo.Visible:=false;
|
||||
tryToPatchMixedIndentation;
|
||||
end;
|
||||
|
||||
procedure TCESynMemo.DoExit;
|
||||
|
@ -3588,8 +3589,8 @@ begin
|
|||
Options:= Options + [eoTabsToSpaces];
|
||||
imMixed:
|
||||
if (isDSource or alwaysAdvancedFeatures) and
|
||||
(dlgYesNo('Mixed indentation style detected, ' +
|
||||
'do you wish to convert to a single mode ?') = mrYes) then
|
||||
(dlgYesNo('Mixed indentation style detected in, "' + fFilename +
|
||||
'", do you wish to convert to a single mode ?') = mrYes) then
|
||||
with TMixedIndentationDialog.construct() do
|
||||
try
|
||||
case ShowModal of
|
||||
|
|
Loading…
Reference in New Issue