Skip to content

Commit 720416e

Browse files
livecodealilivecodeali
authored
Merge pull request livecode#5725 from bwmilby/bugfix-15302
[[ Bug 15302 ]] Fix "occured"
2 parents e1057a3 + 2e5fc54 commit 720416e

34 files changed

Lines changed: 74 additions & 73 deletions

‎docs/notes/bugfix-15302.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix common misspelling of occurred

‎engine/include/customprinter.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,15 +337,15 @@ class MCCustomPrintingDevice
337337

338338
// Return the error string describing the reason for 'false' being returned
339339
// from one of the action methods. 'nil' should be returned if no error
340-
// has occured.
340+
// has occurred.
341341
virtual const char *GetError(void) = 0;
342342

343343
// Start a new document with the given details as present in the
344344
// passed structure.
345345
virtual bool BeginDocument(const MCCustomPrinterDocument& document) = 0;
346346

347347
// Cancel the current document - this should have the same effect as if
348-
// an error occured, but obviously no error should be set.
348+
// an error occurred, but obviously no error should be set.
349349
virtual void AbortDocument(void) = 0;
350350

351351
// Mark the end of a document.

‎engine/src/button.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ void MCButton::open()
454454
MCControl::open();
455455

456456
// MW-2011-02-08: [[ Bug 9382 ]] Make sure we reset icons when opening and the state
457-
// has changed (i.e. background transition has occured).
457+
// has changed (i.e. background transition has occurred).
458458
uint32_t t_old_state;
459459
t_old_state = state;
460460
switch(gethilite(0))

‎engine/src/customprinter.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class MCCustomMetaContext: public MCMetaContext
232232
// can be used.
233233
MCPrinterRectangle m_page_rect;
234234

235-
// If this is true, an error has occured during execute
235+
// If this is true, an error has occurred during execute
236236
bool m_execute_error;
237237

238238
// The untransformed rect and scale of current composite region
@@ -273,7 +273,7 @@ bool MCCustomMetaContext::render(MCCustomPrintingDevice *p_device, const MCPrint
273273

274274
bool MCCustomMetaContext::candomark(MCMark *p_mark)
275275
{
276-
// If an error has occured during this execution, just return true to minimize
276+
// If an error has occurred during this execution, just return true to minimize
277277
// unnecessary rasterization (this is to make up for a lack of error handling
278278
// during the super-classes execution process).
279279
if (m_execute_error)
@@ -377,7 +377,7 @@ bool MCCustomMetaContext::candomark(MCMark *p_mark)
377377

378378
void MCCustomMetaContext::domark(MCMark *p_mark)
379379
{
380-
// If an error has occured, we do nothing.
380+
// If an error has occurred, we do nothing.
381381
if (m_execute_error)
382382
return;
383383

‎engine/src/deploy.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ enum MCDeployError
453453
/* An error occurred while creating the startup stack */
454454
kMCDeployErrorEmscriptenBadStack,
455455

456-
/* An error occured with the pre-deploy step */
456+
/* An error occurred with the pre-deploy step */
457457
kMCDeployErrorTrialBannerError,
458458

459459
// SIGN ERRORS
@@ -472,19 +472,19 @@ enum MCDeployError
472472
// The password did not match
473473
kMCDeployErrorBadPassword,
474474

475-
// An error occured while building the signature
475+
// An error occurred while building the signature
476476
kMCDeployErrorBadSignature,
477477

478-
// An error occured while trying to convert a string
478+
// An error occurred while trying to convert a string
479479
kMCDeployErrorBadString,
480480

481-
// An error occured while trying to compute the hash
481+
// An error occurred while trying to compute the hash
482482
kMCDeployErrorBadHash,
483483

484-
// An error occured while trying to fetch a timestamp
484+
// An error occurred while trying to fetch a timestamp
485485
kMCDeployErrorTimestampFailed,
486486

487-
// An error occured decoding the timestamp response
487+
// An error occurred decoding the timestamp response
488488
kMCDeployErrorBadTimestamp,
489489

490490

‎engine/src/deploy_capsule.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ static bool MCDeployCapsuleFilterFlush(MCDeployCapsuleFilterState& self)
391391
self . stream . next_in = self . input;
392392
}
393393

394-
// If a buf error occured, we either need more space, or more input
394+
// If a buf error occurred, we either need more space, or more input
395395
if (t_result == Z_BUF_ERROR)
396396
{
397397
// If the input buffer is not maxed out, return as we need more input

‎engine/src/deploy_linux.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ Exec_stat MCDeployToELF(const MCDeployParameters& p_params, bool p_is_android)
798798
uint32_t t_end_offset, t_end_size;
799799
if (t_success)
800800
{
801-
// Compute the shift that will have occured to any post-project sections
801+
// Compute the shift that will have occurred to any post-project sections
802802
int32_t t_project_delta, t_payload_delta;
803803
t_project_delta = t_project_size - t_project_section -> sh_size;
804804
if (t_payload_section != NULL)

‎engine/src/dskmac.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5621,7 +5621,7 @@ bool MCS_mac_elevation_bootstrap_main(int argc, char *argv[])
56215621
// And finally exec to the new process (this does not return if successful).
56225622
execvp(t_args[0], t_args);
56235623

5624-
// If we get this far then an error has occured :o(
5624+
// If we get this far then an error has occurred :o(
56255625
return false;
56265626
}
56275627

‎engine/src/dskw32main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
285285
DisplayStartupErrorAndExit();
286286

287287
// Now we loop continually until quit. If 'X_main_loop' returns without quitting
288-
// it means a stack size change request has occured.
288+
// it means a stack size change request has occurred.
289289
while(!MCquit)
290290
{
291291
// Create ourselves a new fiber with appropriate stack size

‎engine/src/environment/stackbehavior.livecodescript‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ on startup pTest
166166
end if
167167
return sHomePath
168168
default
169-
-- Some other error occured, so fall through to activation.
169+
-- Some other error occurred, so fall through to activation.
170170
put "The license for this version has become corrupted, please activate to continue." into sActivateReason
171171
break
172172
end switch
@@ -464,7 +464,7 @@ command performFacelessActivation
464464
break
465465

466466
default
467-
write "An unknown error occured." & return to stdout
467+
write "An unknown error occurred." & return to stdout
468468
quit 12
469469
end switch
470470

@@ -640,7 +640,7 @@ private command automaticActivationList
640640

641641
-- Act on the response for 'nolicenses'
642642
if tPostResult["result"] is "nolicenses" then
643-
put "An error occured while processing the request. Please try again." into sActivateError
643+
put "An error occurred while processing the request. Please try again." into sActivateError
644644
return "error"
645645
end if
646646

@@ -666,7 +666,7 @@ private command automaticActivationList
666666
end if
667667
exit to top
668668
default
669-
-- Some other error occured, so fall through to activation.
669+
-- Some other error occurred, so fall through to activation.
670670
automaticActivationSetProtocolError "invalid"
671671
return "error"
672672
break
@@ -686,7 +686,7 @@ private command leaveRemoteOperation
686686
end leaveRemoteOperation
687687

688688
private command automaticActivationSetPostError pPostError
689-
put "An error occured while attempting to contact the server. Please try again later." into sActivateError
689+
put "An error occurred while attempting to contact the server. Please try again later." into sActivateError
690690
end automaticActivationSetPosterror
691691

692692
private command automaticActivationSetProtocolError pError
@@ -717,7 +717,7 @@ private command automaticActivationSetProtocolError pError
717717
break
718718
case "nolicense"
719719
-- some sort of backend mismatch problem
720-
put "An error occured generating the license key. Please try again." into sActivateError
720+
put "An error occurred generating the license key. Please try again." into sActivateError
721721
break
722722
case "disabled"
723723
-- account disabled
@@ -730,7 +730,7 @@ private command automaticActivationSetProtocolError pError
730730
case "invalid"
731731
default
732732
-- bad request
733-
put "An error has occured while contacting the server. Please try again." into sActivateError
733+
put "An error has occurred while contacting the server. Please try again." into sActivateError
734734
break
735735
end switch
736736
end automaticActivationSetProtocolError

0 commit comments

Comments
 (0)