diff options
Diffstat (limited to 'src')
| -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 |
8 files changed, 14 insertions, 14 deletions
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 4dd2f9fd6..d85b71106 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -1776,7 +1776,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 { @@ -3066,7 +3066,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 e2f906a70..f5e7a1325 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -1140,7 +1140,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 fb3aae6a1..b90ed3010 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -1179,7 +1179,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 = Sci::clamp(static_cast<Sci::Line>(policies.y.slop), static_cast<Sci::Line>(1), halfScreen); if (bEven) { yMarginB = yMarginT; @@ -1235,7 +1235,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 @@ -1328,7 +1328,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 @@ -6173,7 +6173,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 e67426ae7..33e6aabf1 100644 --- a/src/PerLine.cxx +++ b/src/PerLine.cxx @@ -204,7 +204,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) |