@@ -914,10 +914,8 @@ mod cmd {
914914
915915 fn quit(editor: &mut Editor, args: &[&str], event: PromptEvent) {
916916 // last view and we have unsaved changes
917− if editor.tree.views().count() == 1 {
918− if _buffers_remaining(editor) {
919− return;
920− }
917+ if editor.tree.views().count() == 1 && _buffers_remaining(editor) {
918+ return;
921919 }
922920 editor.close(editor.view().id, /* close_buffer */ false);
923921 }
@@ -1056,10 +1054,8 @@ mod cmd {
10561054 editor.set_error(errors);
10571055
10581056 if quit {
1059− if !force {
1060− if _buffers_remaining(editor) {
1061− return;
1062− }
1057+ if !force && _buffers_remaining(editor) {
1058+ return;
10631059 }
10641060
10651061 // close all views
@@ -1083,10 +1079,8 @@ mod cmd {
10831079 }
10841080
10851081 fn _quit_all(editor: &mut Editor, args: &[&str], event: PromptEvent, force: bool) {
1086− if !force {
1087− if _buffers_remaining(editor) {
1088− return;
1089− }
1082+ if !force && _buffers_remaining(editor) {
1083+ return;
10901084 }
10911085
10921086 // close all views