Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 9673e71

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop-8.1_24.07.17
2 parents 1de641a + 720416e commit 9673e71

39 files changed

+154
-78
lines changed

‎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

‎docs/notes/bugfix-20061.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure data is not lost when opening and saving a stack with a widget that is not loaded

‎engine/include/customprinter.h‎

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

344344
// Return the error string describing the reason for 'false' being returned
345345
// from one of the action methods. 'nil' should be returned if no error
346-
// has occured.
346+
// has occurred.
347347
virtual const char *GetError(void) = 0;
348348

349349
// Start a new document with the given details as present in the
350350
// passed structure.
351351
virtual bool BeginDocument(const MCCustomPrinterDocument& document) = 0;
352352

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

357357
// Mark the end of a document.

‎engine/src/button.cpp‎

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

439439
// MW-2011-02-08: [[ Bug 9382 ]] Make sure we reset icons when opening and the state
440-
// has changed (i.e. background transition has occured).
440+
// has changed (i.e. background transition has occurred).
441441
uint32_t t_old_state;
442442
t_old_state = state;
443443
switch(gethilite(0).value)

‎engine/src/customprinter.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ class MCCustomMetaContext: public MCMetaContext
215215
// can be used.
216216
MCPrinterRectangle m_page_rect;
217217

218-
// If this is true, an error has occured during execute
218+
// If this is true, an error has occurred during execute
219219
bool m_execute_error;
220220

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

257257
bool MCCustomMetaContext::candomark(MCMark *p_mark)
258258
{
259-
// If an error has occured during this execution, just return true to minimize
259+
// If an error has occurred during this execution, just return true to minimize
260260
// unnecessary rasterization (this is to make up for a lack of error handling
261261
// during the super-classes execution process).
262262
if (m_execute_error)
@@ -359,7 +359,7 @@ bool MCCustomMetaContext::candomark(MCMark *p_mark)
359359

360360
void MCCustomMetaContext::domark(MCMark *p_mark)
361361
{
362-
// If an error has occured, we do nothing.
362+
// If an error has occurred, we do nothing.
363363
if (m_execute_error)
364364
return;
365365

‎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
@@ -389,7 +389,7 @@ static bool MCDeployCapsuleFilterFlush(MCDeployCapsuleFilterState& self)
389389
self . stream . next_in = self . input;
390390
}
391391

392-
// If a buf error occured, we either need more space, or more input
392+
// If a buf error occurred, we either need more space, or more input
393393
if (t_result == Z_BUF_ERROR)
394394
{
395395
// 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
@@ -5522,7 +5522,7 @@ bool MCS_mac_elevation_bootstrap_main(int argc, char *argv[])
55225522
// And finally exec to the new process (this does not return if successful).
55235523
execvp(t_args[0], t_args);
55245524

5525-
// If we get this far then an error has occured :o(
5525+
// If we get this far then an error has occurred :o(
55265526
return false;
55275527
}
55285528

‎engine/src/dskw32main.cpp‎

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

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

0 commit comments

Comments
 (0)