xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More OSX fixes

Browse Source
This commit is contained in:
Maxime Coste 2014-04-02 22:52:00 +01:00
parent bf84f5dcef
commit e94a82ac98
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/highlighters.cc
View File

@ -398,7 +398,7 @@ void show_matching_char(const Context& context, HighlightFlags flags, DisplayBuf
{ {
auto& colors = get_color("MatchingChar"); auto& colors = get_color("MatchingChar");
using CodepointPair = std::pair<Codepoint, Codepoint>; using CodepointPair = std::pair<Codepoint, Codepoint>;
constexpr CodepointPair matching_chars[] = { { '(', ')' }, { '{', '}' }, { '[', ']' }, { '<', '>' } }; static const CodepointPair matching_chars[] = { { '(', ')' }, { '{', '}' }, { '[', ']' }, { '<', '>' } };
const auto range = display_buffer.range(); const auto range = display_buffer.range();
const auto& buffer = context.buffer(); const auto& buffer = context.buffer();
for (auto& sel : context.selections()) for (auto& sel : context.selections())

3
src/input_handler.cc
View File

@ -787,8 +787,7 @@ public:
} }
matches.erase(prefix); matches.erase(prefix);
CandidateList result; CandidateList result;
std::copy(make_move_iterator(matches.begin()), std::copy(matches.begin(), matches.end(),
make_move_iterator(matches.end()),
inserter(result, result.begin())); inserter(result, result.begin()));
std::sort(result.begin(), result.end()); std::sort(result.begin(), result.end());
return { begin.coord(), end.coord(), std::move(result), buffer.timestamp() }; return { begin.coord(), end.coord(), std::move(result), buffer.timestamp() };