Collapse jumps based on current index change

The previous method, while likely more correct, could restore jump
lists containing references to already removed buffers.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/context.hh b/src/context.hh
index d8830b2e..b71e6547 100644
--- a/src/context.hh
+++ b/src/context.hh
@@ -21,7 +21,7 @@ class AliasRegistry;
 
 struct JumpList
 {
-    void push(SelectionList jump);
+    void push(SelectionList jump, Optional<size_t> index = {});
     const SelectionList& forward(Context& context, int count);
     const SelectionList& backward(Context& context, int count);
     void forget_buffer(Buffer& buffer);
@@ -33,6 +33,8 @@ struct JumpList
 
     friend bool operator!=(const JumpList& lhs, const JumpList& rhs) { return not (lhs == rhs); }
 
+    size_t current_index() const { return m_current; }
+
 private:
     using Contents = Vector<SelectionList, MemoryDomain::Selections>;
     Contents m_jumps;