[elpa] externals/objed 0800b1f 201/216: Improve objed-quit-window

[Stefan Monnier]

branch: externals/objed
commit 0800b1f3998d208082b56df6e029a040fc818305
Author: Clemera <address@hidden>
Commit: Clemera <address@hidden>

    Improve objed-quit-window
---
 objed.el | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/objed.el b/objed.el
index baae28c..de5427e 100644
--- a/objed.el
+++ b/objed.el
@@ -579,14 +579,16 @@ BEFORE and AFTER are forms to execute before/after 
calling the command."
 
 (defun objed-quit-window (&optional kill window)
   (interactive "P")
-  (unless (one-window-p)
-    (let* ((overriding-terminal-local-map nil)
-           (nc (key-binding "q")))
-      (objed--reset)
+  (let* ((overriding-terminal-local-map nil)
+         (nc (key-binding "q")))
       (if (eq nc 'quit-window)
-          (quit-window kill window)
-        (delete-window))
-      (objed-activate 'line))))
+          (progn (objed--reset)
+                 (quit-window kill window)
+                 (objed-activate 'line))
+        (unless (one-window-p)
+          (objed--reset)
+          (delete-window)
+          (objed-activate 'line)))))
 
 (defvar objed-map
   (let ((map (make-sparse-keymap)))