Fix typos. Closes various pull requests.

This commit is contained in:
jogo- 2020-08-10 21:00:18 +02:00 committed by Martijn Laan
parent e01e53f6fd
commit cba8164d39
14 changed files with 23 additions and 23 deletions

View File

@ -723,7 +723,7 @@ begin
Call(SCI_SETSCROLLWIDTH, 1024 * CallStr(SCI_TEXTWIDTH, 0, 'X'), 0);
Call(SCI_INDICSETSTYLE, inSquiggly, INDIC_SQUIGGLE);
Call(SCI_INDICSETFORE, inSquiggly, clRed); { May be overwitten by UpdateThemeColors }
Call(SCI_INDICSETFORE, inSquiggly, clRed); { May be overwritten by UpdateThemeColors }
Call(SCI_INDICSETSTYLE, inPendingSquiggly, INDIC_HIDDEN);
Call(SCI_SETMARGINTYPEN, 1, SC_MARGIN_SYMBOL);
@ -1863,7 +1863,7 @@ begin
StatusMessage(smkError, SCompilerStatusErrorAborted);
if not ReadFromFile and (AppData.ErrorLine > 0) and
(AppData.ErrorFilename = '') then begin
{ Move the caret to the line number the error occured on }
{ Move the caret to the line number the error occurred on }
MoveCaret(AppData.ErrorLine - 1, False);
SetErrorLine(AppData.ErrorLine - 1);
end;

View File

@ -87,9 +87,9 @@ type
iscbNotifyError: (
ErrorMsg: PChar; { [in] The error message, or NULL if compilation
was aborted by the application. }
ErrorFilename: PChar; { [in] Filename in which the error occured. This
ErrorFilename: PChar; { [in] Filename in which the error occurred. This
is NULL if the file is the main script. }
ErrorLine: Integer); { [in] The line number the error occured on.
ErrorLine: Integer); { [in] The line number the error occurred on.
Zero if the error doesn't apply to any
particular line. }
end;

View File

@ -3906,7 +3906,7 @@ begin
ssDiskSpanning: begin
DiskSpanning := StrToBool(Value);
end;
ssDontMergeDuplicateFiles: begin { obsolete; superceded by "MergeDuplicateFiles" }
ssDontMergeDuplicateFiles: begin { obsolete; superseded by "MergeDuplicateFiles" }
if SetupDirectiveLines[ssMergeDuplicateFiles] = 0 then
DontMergeDuplicateFiles := StrToBool(Value);
WarningsList.Add(Format(SCompilerEntrySuperseded2, ['Setup', KeyName,
@ -7055,7 +7055,7 @@ begin
end;
procedure TSetupCompiler.CheckCustomMessageReferences;
{ Checks existance of expected custom message constants }
{ Checks existence of expected custom message constants }
var
LineInfo: TLineInfo;
Found: Boolean;
@ -9017,7 +9017,7 @@ begin
AddDefaultSetupType(DefaultTypeEntryNames[2], [toIsCustom], ttDefaultCustom);
end;
{ Check existance of expected custom message constants }
{ Check existence of expected custom message constants }
CheckCustomMessageReferences;
{ Compile CodeText }

View File

@ -251,7 +251,7 @@ begin
SendCopyDataMessageStr(DebugWnd, DebugClientWnd, CD_Debugger_ReplyW,
EvaluateResult);
except
{ don't propogate exceptions }
{ don't propagate exceptions }
end;
end;
CD_DebugClient_EvaluateVariableEntry: begin
@ -270,7 +270,7 @@ begin
SendCopyDataMessageStr(DebugWnd, DebugClientWnd, CD_Debugger_ReplyW,
EvaluateResult);
except
{ don't propogate exceptions }
{ don't propagate exceptions }
end;
end;
CD_DebugClient_CompiledCodeTextA: begin
@ -280,7 +280,7 @@ begin
TWMCopyData(Message).CopyDataStruct.cbData div SizeOf(AnsiChar));
Message.Result := 1;
except
{ don't propogate exceptions }
{ don't propagate exceptions }
end;
end;
CD_DebugClient_CompiledCodeDebugInfoA: begin
@ -290,7 +290,7 @@ begin
TWMCopyData(Message).CopyDataStruct.cbData div SizeOf(AnsiChar));
Message.Result := 1;
except
{ don't propogate exceptions }
{ don't propagate exceptions }
end;
end;
end;

View File

@ -410,7 +410,7 @@ begin
try
InternalCall(REQUEST_PING, 0, False);
except
{ Don't propogate any exception; just log it and restart the helper }
{ Don't propagate any exception; just log it and restart the helper }
Log('Ping failed; helper seems to have died.');
Stop(True);
Start;

View File

@ -47,7 +47,7 @@ const
SFailedToParsePragmaDirective = 'Failed to parse ''pragma'' directive';
SFuncIdentForIfdef = 'Function identifier passed to ''ifdef''/''ifndef'' directive';
SSpecFuncIdentForIfdef = 'Special function identifier passed to ''ifdef''/''ifndef'' directive, result is undefined';
SSpecifiedConditionEvalatedToVoid = 'Specified condition evalated to void, to test variable for existance use "defined" function';
SSpecifiedConditionEvalatedToVoid = 'Specified condition evaluated to void, to test variable for existence use "defined" function';
{ Status messages }

View File

@ -648,7 +648,7 @@ begin
end;
end;
except
{ don't propogate exceptions (e.g. from StrToInt) }
{ don't propagate exceptions (e.g. from StrToInt) }
end;
{ If we failed to read the count, or it's in some type we don't recognize,
don't touch it }
@ -1196,7 +1196,7 @@ begin
end;
end;
except
{ don't propogate exceptions }
{ don't propagate exceptions }
end;
Result := MD5Final(Context);
end;

View File

@ -397,7 +397,7 @@ var
begin
N := Length(CompiledCodeText);
if N mod 2 = 1 then
Inc(N); { This will lead to 1 extra byte being moved but that's ok since its the #0 }
Inc(N); { This will lead to 1 extra byte being moved but that's ok since it is the #0 }
N := N div 2;
SetString(Result, PChar(Pointer(CompiledCodeText)), N);
{$ELSE}

View File

@ -95,7 +95,7 @@ begin
F := TTextFileWriter.Create(Filename, fdCreateNew, faWrite, fsRead);
except
on E: EFileError do begin
{ Don't propogate ERROR_FILE_EXISTS errors; just try again.
{ Don't propagate ERROR_FILE_EXISTS errors; just try again.
(Yes, we already checked if the file existed first, but this helps
to make it race-proof.) }
if E.ErrorCode <> ERROR_FILE_EXISTS then

View File

@ -211,7 +211,7 @@ begin
I := ScriptCompiler.FindExport(String(Proc.Name), String(Procdecl), -1);
if I <> -1 then begin
{ The function name is a matche and the function prototype is ok. }
{ The function name is a match and the function prototype is ok. }
ScriptExport := ScriptCompiler.FExports[I];
ScriptExport.Exported := True;
Result := True;

View File

@ -196,7 +196,7 @@ begin
EntryCount, Inheritance);
except
{ If the helper interface (or even InternalGrantPermission) raises an
exception, don't propogate it. Just log it and return an error code, as
exception, don't propagate it. Just log it and return an error code, as
that's what the caller is expecting on failure. }
Log('Exception while setting permissions:' + SNewLine + GetExceptMessage);
Result := ERROR_GEN_FAILURE;

View File

@ -300,7 +300,7 @@ begin
try
DeinitSetup(False);
except
{ don't propogate any exceptions, so that Halt is always called }
{ don't propagate any exceptions, so that Halt is always called }
ShowExceptionMsg;
end;
if SetupExitCode <> 0 then

View File

@ -165,7 +165,7 @@ begin
F.Free;
end;
except
{ don't propogate exceptions }
{ don't propagate exceptions }
end;
end;

View File

@ -729,7 +729,7 @@ end;
constructor TWizardForm.Create(AOwner: TComponent);
{ Do all initialization of the wizard form. We're overriding Create instead of
using the FormCreate event, because if an exception is raised in FormCreate
it's not propogated out. }
it's not propagated out. }
procedure LoadSelectDirAndGroupImages;
@ -3038,7 +3038,7 @@ begin
if NextButton.CanFocus then
NextButton.Click;
except
{ Mustn't propogate post-install exceptions }
{ Mustn't propagate post-install exceptions }
if MainForm.CurStep <= ssInstall then
raise
else