diff options
author | Neil <nyamatongwe@gmail.com> | 2020-03-26 09:28:15 +1100 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2020-03-26 09:28:15 +1100 |
commit | 5e1f3c9b721f436cd60961af3df53734f10deedf (patch) | |
tree | 36499b447ce0b871aafdd1bd23716b120d70ed27 | |
parent | 46d00d15940a78ba6cd5fb5b884e08d0394c3abe (diff) | |
download | scintilla-mirror-5e1f3c9b721f436cd60961af3df53734f10deedf.tar.gz |
Fix spelling mistakes.
-rwxr-xr-x | gtk/PlatGTK.cxx | 6 | ||||
-rwxr-xr-x | gtk/ScintillaGTK.cxx | 6 | ||||
-rw-r--r-- | lexers/LexPython.cxx | 6 | ||||
-rw-r--r-- | src/AutoComplete.h | 4 | ||||
-rw-r--r-- | src/CharClassify.cxx | 2 | ||||
-rw-r--r-- | src/Document.cxx | 4 | ||||
-rw-r--r-- | src/EditView.cxx | 2 | ||||
-rw-r--r-- | src/Editor.cxx | 8 | ||||
-rw-r--r-- | src/PerLine.cxx | 2 | ||||
-rw-r--r-- | src/RESearch.cxx | 4 | ||||
-rw-r--r-- | src/SplitVector.h | 2 | ||||
-rw-r--r-- | win32/PlatWin.cxx | 4 | ||||
-rw-r--r-- | win32/ScintillaWin.cxx | 2 |
13 files changed, 26 insertions, 26 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index ada99aca2..ba3493948 100755 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -306,7 +306,7 @@ bool SurfaceImpl::Initialised() { if (inited && context) { if (cairo_status(context) == CAIRO_STATUS_SUCCESS) { // Even when status is success, the target surface may have been - // finished whch may cause an assertion to fail crashing the application. + // finished which may cause an assertion to fail crashing the application. // The cairo_surface_has_show_text_glyphs call checks the finished flag // and when set, sets the status to CAIRO_STATUS_SURFACE_FINISHED // which leads to warning messages instead of crashes. @@ -1392,13 +1392,13 @@ static gboolean ButtonRelease(GtkWidget *, GdkEventButton *ev, gpointer p) { return FALSE; } -/* Change the active color to the selected color so the listbox uses the color +/* Change the active colour to the selected colour so the listbox uses the colour scheme that it would use if it had the focus. */ static void StyleSet(GtkWidget *w, GtkStyle *, void *) { g_return_if_fail(w != nullptr); - /* Copy the selected color to active. Note that the modify calls will cause + /* Copy the selected colour to active. Note that the modify calls will cause recursive calls to this function after the value is updated and w->style to be set to a new object */ diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 40045e4fc..5cf567966 100755 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -1533,7 +1533,7 @@ void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, Se // As I can not work out how to store data on the clipboard in multiple formats // and need some way to mark the clipping as being stream or rectangular, // the terminating \0 is included in the length for rectangular clippings. - // All other tested aplications behave benignly by ignoring the \0. + // All other tested applications behave benignly by ignoring the \0. // The #if is here because on Windows cfColumnSelect clip entry is used // instead as standard indicator of rectangularness (so no need to kludge) const char *textData = text->Data(); @@ -1750,7 +1750,7 @@ gint ScintillaGTK::PressThis(GdkEventButton *event) { if (event->button == 1) { #if PLAT_GTK_MACOSX const bool meta = ctrl; - // GDK reports the Command modifer key as GDK_MOD2_MASK for button events, + // GDK reports the Command modifier key as GDK_MOD2_MASK for button events, // not GDK_META_MASK like in key events. ctrl = (event->state & GDK_MOD2_MASK) != 0; #else @@ -1779,7 +1779,7 @@ gint ScintillaGTK::PressThis(GdkEventButton *event) { } else { #if PLAT_GTK_MACOSX const bool meta = ctrl; - // GDK reports the Command modifer key as GDK_MOD2_MASK for button events, + // GDK reports the Command modifier key as GDK_MOD2_MASK for button events, // not GDK_META_MASK like in key events. ctrl = (event->state & GDK_MOD2_MASK) != 0; #else diff --git a/lexers/LexPython.cxx b/lexers/LexPython.cxx index 24a11e3b0..fc1d8584e 100644 --- a/lexers/LexPython.cxx +++ b/lexers/LexPython.cxx @@ -192,7 +192,7 @@ inline bool IsAWordChar(int ch, bool unicodeIdentifiers) { if (!unicodeIdentifiers) return false; - // Python uses the XID_Continue set from unicode data + // Python uses the XID_Continue set from Unicode data return IsXidContinue(ch); } @@ -203,7 +203,7 @@ inline bool IsAWordStart(int ch, bool unicodeIdentifiers) { if (!unicodeIdentifiers) return false; - // Python uses the XID_Start set from unicode data + // Python uses the XID_Start set from Unicode data return IsXidStart(ch); } @@ -300,7 +300,7 @@ struct OptionSetPython : public OptionSet<OptionsPython> { DefineProperty("fold.compact", &OptionsPython::foldCompact); DefineProperty("lexer.python.unicode.identifiers", &OptionsPython::unicodeIdentifiers, - "Set to 0 to not recognise Python 3 unicode identifiers."); + "Set to 0 to not recognise Python 3 Unicode identifiers."); DefineWordListSets(pythonWordListDesc); } diff --git a/src/AutoComplete.h b/src/AutoComplete.h index 6440c13d4..c5b40ad14 100644 --- a/src/AutoComplete.h +++ b/src/AutoComplete.h @@ -17,7 +17,7 @@ class AutoComplete { std::string stopChars; std::string fillUpChars; char separator; - char typesep; // Type seperator + char typesep; // Type separator enum { maxItemLen=1000 }; std::vector<int> sortMatrix; @@ -28,7 +28,7 @@ public: std::unique_ptr<ListBox> lb; Sci::Position posStart; Sci::Position startLen; - /// Should autocompletion be canceled if editor's currentPos <= startPos? + /// Should autocompletion be cancelled if editor's currentPos <= startPos? bool cancelAtStartPos; bool autoHide; bool dropRestOfWord; diff --git a/src/CharClassify.cxx b/src/CharClassify.cxx index 5ae47a2ef..eb40a89c2 100644 --- a/src/CharClassify.cxx +++ b/src/CharClassify.cxx @@ -34,7 +34,7 @@ void CharClassify::SetDefaultCharClasses(bool includeWordClass) { } void CharClassify::SetCharClasses(const unsigned char *chars, cc newCharClass) { - // Apply the newCharClass to the specifed chars + // Apply the newCharClass to the specified chars if (chars) { while (*chars) { charClass[*chars] = static_cast<unsigned char>(newCharClass); diff --git a/src/Document.cxx b/src/Document.cxx index d60cef3bb..2c2d86de6 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -1773,7 +1773,7 @@ CharClassify::cc Document::WordCharacterClass(unsigned int ch) const { } /** - * Used by commmands that want to select whole words. + * Used by commands that want to select whole words. * Finds the start of word at pos when delta < 0 or the end of the word when delta >= 0. */ Sci::Position Document::ExtendWordSelect(Sci::Position pos, int delta, bool onlyWordCharacters) const { @@ -3063,7 +3063,7 @@ Sci::Position Cxx11RegexFindText(const Document *doc, Sci::Position minPos, Sci: try { //ElapsedPeriod ep; std::regex::flag_type flagsRe = std::regex::ECMAScript; - // Flags that apper to have no effect: + // Flags that appear to have no effect: // | std::regex::collate | std::regex::extended; if (!caseSensitive) flagsRe = flagsRe | std::regex::icase; diff --git a/src/EditView.cxx b/src/EditView.cxx index 9cacafb3b..14ccec908 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -1231,7 +1231,7 @@ void EditView::DrawFoldDisplayText(Surface *surface, const EditModel &model, con if (model.trackLineWidth) { if (rcSegment.right + 1> lineWidthMaxSeen) { - // Fold display text border drawn on rcSegment.right with width 1 is the last visble object of the line + // Fold display text border drawn on rcSegment.right with width 1 is the last visible object of the line lineWidthMaxSeen = static_cast<int>(rcSegment.right + 1); } } diff --git a/src/Editor.cxx b/src/Editor.cxx index 2709e3d3d..17cabd065 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -1183,7 +1183,7 @@ Editor::XYScrollPosition Editor::XYScrollToMakeVisible(const SelectionRange &ran yMarginT = yMarginB = 0; } else { // yMarginT must equal to caretYSlop, with a minimum of 1 and - // a maximum of slightly less than half the heigth of the text area. + // a maximum of slightly less than half the height of the text area. yMarginT = std::clamp<Sci::Line>(policies.y.slop, 1, halfScreen); if (bEven) { yMarginB = yMarginT; @@ -1239,7 +1239,7 @@ Editor::XYScrollPosition Editor::XYScrollToMakeVisible(const SelectionRange &ran } } else { // Strict or going out of display if (bEven) { - // Always center caret + // Always centre caret newXY.topLine = lineCaret - halfScreen; } else { // Always put caret on top of display @@ -1332,7 +1332,7 @@ Editor::XYScrollPosition Editor::XYScrollToMakeVisible(const SelectionRange &ran (bJump && (pt.x < rcClient.left || pt.x >= rcClient.right))) { // Strict or going out of display if (bEven) { - // Center caret + // Centre caret newXY.xOffset += static_cast<int>(pt.x - rcClient.left - halfScreen); } else { // Put caret on right @@ -6178,7 +6178,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { InvalidateStyleRedraw(); break; - // Control specific mesages + // Control specific messages case SCI_ADDTEXT: { if (lParam == 0) diff --git a/src/PerLine.cxx b/src/PerLine.cxx index ed5e463d6..017eb77b8 100644 --- a/src/PerLine.cxx +++ b/src/PerLine.cxx @@ -205,7 +205,7 @@ void LineLevels::InsertLine(Sci::Line line) { void LineLevels::RemoveLine(Sci::Line line) { if (levels.Length()) { // Move up following lines but merge header flag from this line - // to line before to avoid a temporary disappearence causing expansion. + // to line before to avoid a temporary disappearance causing expansion. int firstHeader = levels[line] & SC_FOLDLEVELHEADERFLAG; levels.Delete(line); if (line == levels.Length()-1) // Last line loses the header flag diff --git a/src/RESearch.cxx b/src/RESearch.cxx index dd9cb75af..a682016bc 100644 --- a/src/RESearch.cxx +++ b/src/RESearch.cxx @@ -139,7 +139,7 @@ * W: any char except alphanumeric & underscore (see above) * * [12] \xHH a backslash followed by x and two hexa digits, - * becomes the character whose Ascii code is equal + * becomes the character whose ASCII code is equal * to these digits. If not followed by two digits, * it is 'x' char itself. * @@ -350,7 +350,7 @@ int RESearch::GetBackslashExpression( int &incr) noexcept { // Since error reporting is primitive and messages are not used anyway, // I choose to interpret unexpected syntax in a logical way instead - // of reporting errors. Otherwise, we can stick on, eg., PCRE behavior. + // of reporting errors. Otherwise, we can stick on, eg., PCRE behaviour. incr = 0; // Most of the time, will skip the char "naturally". int c; int result = -1; diff --git a/src/SplitVector.h b/src/SplitVector.h index a8f1ed1d9..fcd8b0d0e 100644 --- a/src/SplitVector.h +++ b/src/SplitVector.h @@ -85,7 +85,7 @@ public: } /// Reallocate the storage for the buffer to be newSize and - /// copy exisiting contents to the new buffer. + /// copy existing contents to the new buffer. /// Must not be used to decrease the size of the buffer. void ReAllocate(ptrdiff_t newSize) { if (newSize < 0) diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 471f93229..bcca2ac65 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -2839,7 +2839,7 @@ void ListBoxX::StartResize(WPARAM hitCode) { break; // Note that the current hit test code prevents the left edge cases ever firing - // as we don't want the left edge to be moveable + // as we don't want the left edge to be movable case HTLEFT: case HTTOP: case HTTOPLEFT: @@ -2875,7 +2875,7 @@ LRESULT ListBoxX::NcHitTest(WPARAM wParam, LPARAM lParam) const { } } - // Nerver permit resizing that moves the left edge. Allow movement of top or bottom edge + // Never permit resizing that moves the left edge. Allow movement of top or bottom edge // depending on whether the list is above or below the caret switch (hit) { case HTLEFT: diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index a9931afde..be485f051 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -2931,7 +2931,7 @@ LRESULT ScintillaWin::ImeOnReconvert(LPARAM lParam) { } void ScintillaWin::GetIntelliMouseParameters() noexcept { - // This retrieves the number of lines per scroll as configured inthe Mouse Properties sheet in Control Panel + // This retrieves the number of lines per scroll as configured in the Mouse Properties sheet in Control Panel ::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &linesPerScroll, 0); } |