From df217f71c15d95f75e7a716ab458f6c23db313d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20K=C4=99pka?= <wojtek.kepka@protonmail.com>
Date: Sun, 13 Jun 2021 11:54:00 +0200
Subject: [PATCH] Fix `wq`

---
 helix-term/src/commands.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 38f4ce107..6111dd7b3 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -949,9 +949,7 @@ mod cmd {
             };
         }
         if doc.path().is_none() {
-            return Err(anyhow!(
-                "cannot write a buffer without a filename".to_string()
-            ));
+            return Err(anyhow!("cannot write a buffer without a filename"));
         }
         let autofmt = doc
             .language_config()
@@ -1006,8 +1004,12 @@ mod cmd {
     }
 
     fn write_quit(editor: &mut Editor, args: &[&str], event: PromptEvent) {
-        write(editor, args, event);
-        quit(editor, &[], event);
+        let (view, doc) = editor.current();
+        if let Err(e) = _write(view, doc, args.first()) {
+            editor.set_error(e.to_string());
+            return;
+        };
+        quit(editor, &[], event)
     }
 
     fn force_write_quit(editor: &mut Editor, args: &[&str], event: PromptEvent) {