summaryrefslogtreecommitdiff
path: root/src/normal.cc
diff options
context:
space:
mode:
authorMaxime Coste <frrrwww@gmail.com>2014-03-29 08:55:45 +0000
committerMaxime Coste <frrrwww@gmail.com>2014-03-29 08:55:45 +0000
commitda9d099f3bdf1806b647fd8deabac60552bb04b2 (patch)
tree1986b1e48ab3617e420b7936649d4bdbc5d907ab /src/normal.cc
parentc38e14958fd53df2b697319920cd4d3c285ad372 (diff)
Remove Range struct, merge it back in Selection
Diffstat (limited to 'src/normal.cc')
-rw-r--r--src/normal.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/normal.cc b/src/normal.cc
index 4297e7bb..75b04e59 100644
--- a/src/normal.cc
+++ b/src/normal.cc
@@ -296,7 +296,7 @@ void goto_commands(Context& context, int line)
}
case 'f':
{
- const Range& sel = context.selections().main();
+ const Selection& sel = context.selections().main();
String filename = content(buffer, sel);
static constexpr char forbidden[] = { '\'', '\\', '\0' };
for (auto c : forbidden)
@@ -1211,7 +1211,7 @@ private:
SelectionList m_ranges;
};
-inline bool touches(const Buffer& buffer, const Range& lhs, const Range& rhs)
+inline bool touches(const Buffer& buffer, const Selection& lhs, const Selection& rhs)
{
return lhs.min() <= rhs.min() ? buffer.char_next(lhs.max()) >= rhs.min()
: lhs.min() <= buffer.char_next(rhs.max());