Commit cb866c44 authored by Sag0Sag0's avatar Sag0Sag0

More merge stuff

parents 8448c9f8 a2d04551
......@@ -98,7 +98,11 @@ impl Context {
) -> io::Result<String> {
let res = {
let stdout = stdout().into_raw_mode()?;
<<<<<<< HEAD
let ed = Editor::new_with_init_buffer(stdout, prompt, self, buffer)?;
=======
let ed = Editor::new_with_init_buffer(stdout, prompt, f, self, buffer)?;
>>>>>>> a2d04551699db3a8b850d2bf7c00febe71190986
match self.key_bindings {
KeyBindings::Emacs => Self::handle_keys(keymap::Emacs::new(ed), handler),
KeyBindings::Vi => Self::handle_keys(keymap::Vi::new(ed), handler),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment