df217f7 · helix · git.iko.soy

on master help sign in

Fix `wq`

df217f7Wojciech Kępka5 years ago

helix-term/src/commands.rs+7−5

@@ -949,9 +949,7 @@ mod cmd {

949 };

950 }

951 if doc.path().is_none() {

952− return Err(anyhow!(

953− "cannot write a buffer without a filename".to_string()

952+ return Err(anyhow!("cannot write a buffer without a filename"));

954− ));

955 }

953 }

956 let autofmt = doc

954 let autofmt = doc

957 .language_config()

955 .language_config()

@@ -1006,8 +1004,12 @@ mod cmd {

1006 }

1004 }

1007

1005

1008 fn write_quit(editor: &mut Editor, args: &[&str], event: PromptEvent) {

1006 fn write_quit(editor: &mut Editor, args: &[&str], event: PromptEvent) {

1009− write(editor, args, event);

1007+ let (view, doc) = editor.current();

1008+ if let Err(e) = _write(view, doc, args.first()) {

1009+ editor.set_error(e.to_string());

1010+ return;

1011+ };

1010− quit(editor, &[], event);

1012+ quit(editor, &[], event)

1011 }

1013 }

1012

1014

1013 fn force_write_quit(editor: &mut Editor, args: &[&str], event: PromptEvent) {

1015 fn force_write_quit(editor: &mut Editor, args: &[&str], event: PromptEvent) {