delete window when done

tralph3 · May 29, 2024 · 4e14d96 · 4e14d96
1 parent a56625d
commit 4e14d96
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/conner.el b/conner.el
@@ -420,37 +420,37 @@ Once finished, the command is verified to be valid with
 command is returned."
   (let ((buffer (generate-new-buffer "*conner-edit-command*"))
         (keymap (make-sparse-keymap)))
-    (switch-to-buffer buffer)
-    (lisp-data-mode)
-    (define-key keymap (kbd "C-c C-c") (lambda ()
-                                         (interactive)
-                                         (save-excursion
-                                           (goto-char (point-min))
-                                           (let ((contents (read (current-buffer))))
-                                             (conner--validate-command-plist contents))
-                                           (exit-recursive-edit))))
-    (define-key keymap (kbd "C-c C-k") (lambda ()
-                                         (interactive)
-                                         (kill-buffer)
-                                         (abort-recursive-edit)))
-    (when conner-use-navigation-in-command-edit
-      (define-key keymap (kbd "<tab>") #'conner--edit-move-to-next-command)
-      (define-key keymap (kbd "<backtab>") #'conner--edit-move-to-prev-command))
-    (insert (conner--pp-plist (or command conner--command-template)))
-    (goto-char (point-min))
-    (conner--edit-move-to-next-command)
-    (if conner-use-navigation-in-command-edit
-        (setq header-line-format "Submit with ‘C-c C-c’ or abort with ‘C-c C-k’. Use ‘<tab>‘ and ‘<backtab>‘ to navigate.")
-      (setq header-line-format "Submit with ‘C-c C-c’ or abort with ‘C-c C-k’."))
-    (use-local-map keymap)
-    (recursive-edit)
-    (goto-char (point-min))
-    (let ((contents (read (current-buffer))))
-      (kill-buffer)
-      (conner--validate-command-plist contents)
-      (conner--clean-command-plist contents))))
     (pop-to-buffer buffer)
     (with-current-buffer buffer
+      (lisp-data-mode)
+      (define-key keymap (kbd "C-c C-c") (lambda ()
+                                           (interactive)
+                                           (save-excursion
+                                             (goto-char (point-min))
+                                             (let ((contents (read (current-buffer))))
+                                               (conner--validate-command-plist contents))
+                                             (exit-recursive-edit))))
+      (define-key keymap (kbd "C-c C-k") (lambda ()
+                                           (interactive)
+                                           (kill-buffer)
+                                           (delete-window)
+                                           (abort-recursive-edit)))
+      (when conner-use-navigation-in-command-edit
+        (define-key keymap (kbd "<tab>") #'conner--edit-move-to-next-command)
+        (define-key keymap (kbd "<backtab>") #'conner--edit-move-to-prev-command))
+      (insert (conner--pp-plist (or command conner--command-template)))
+      (goto-char (point-min))
+      (conner--edit-move-to-next-command)
+      (if conner-use-navigation-in-command-edit
+          (setq header-line-format "Submit with ‘C-c C-c’ or abort with ‘C-c C-k’. Use ‘<tab>‘ and ‘<backtab>‘ to navigate.")
+        (setq header-line-format "Submit with ‘C-c C-c’ or abort with ‘C-c C-k’."))
+      (use-local-map keymap)
+      (recursive-edit)
+      (goto-char (point-min))
+      (let ((contents (read (current-buffer))))
+        (kill-buffer)
+        (delete-window)
+        (conner--validate-command-plist contents)
         (conner--clean-command-plist contents)))))
 
 ;;;###autoload