diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-05-22 11:00:32 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-05-22 11:00:32 +1000 |
| commit | 10470df251bacc1a9f01fadf07e8e03d0a934ffe (patch) | |
| tree | 85ba99142c043ed26cb9b1f090f57ef1d1cdac1d /src | |
| parent | a07eca41846561377a50602e9075aac3601eaf95 (diff) | |
| download | scintilla-mirror-10470df251bacc1a9f01fadf07e8e03d0a934ffe.tar.gz | |
More canonical version of previous change 6283.
Diffstat (limited to 'src')
| -rw-r--r-- | src/PerLine.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/PerLine.cxx b/src/PerLine.cxx index b258c745c..d8cf729c3 100644 --- a/src/PerLine.cxx +++ b/src/PerLine.cxx @@ -78,11 +78,7 @@ bool MarkerHandleSet::RemoveNumber(int markerNum, bool all) { } void MarkerHandleSet::CombineWith(MarkerHandleSet *other) { - if (mhList.empty()) { - mhList = std::move(other->mhList); - } else { - mhList.splice_after(mhList.cbegin(), other->mhList); - } + mhList.splice_after(mhList.before_begin(), other->mhList); } LineMarkers::~LineMarkers() { |