diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2020-08-11 00:32:20 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2020-08-11 22:03:54 -0400 |
| commit | ff3b7724a75427c8d73a9b80f9ee5057250479cd (patch) | |
| tree | d899b08fc67d9bbae4258feca3246cf18acb2b1a | |
| parent | 2341b3403e607a1efd8cd47093cd7200bc63e521 (diff) | |
| download | piem-ff3b7724a75427c8d73a9b80f9ee5057250479cd.tar.gz | |
piem-am: Clean up hidden buffers produced by interactive calls
When called interactively, piem-am retrieves the mbox with
piem-am-ready-mbox. As piem-am-ready-mbox's docstring says, the
caller is responsible for cleaning up the buffer. Make piem-am do so
to avoid leaving a hidden buffer around for each mbox applied.
Message-Id: <20200811043220.14679-1-kyle@kyleam.com>
| -rw-r--r-- | piem.el | 17 |
1 files changed, 13 insertions, 4 deletions
@@ -553,12 +553,18 @@ If CODEREPO is given, switch to this directory before calling (or (piem-am-ready-mbox) (user-error "Could not find am-ready mbox for current buffer")))) - (list mbox + ;; We're responsible for cleaning up the buffer created by + ;; `piem-am-ready-mbox'; sneak in an indication to let the + ;; downstream code know. + (list (cons :interactive mbox) format (piem-extract-mbox-info mbox) (piem-inbox-coderepo-maybe-read)))) (setq format (or format "mboxrd")) - (let ((default-directory (or coderepo default-directory))) + (let ((default-directory (or coderepo default-directory)) + (interactivep (eq (car-safe mbox) :interactive))) + (when interactivep + (setq mbox (cdr mbox))) (let ((new-branch (read-string "New branch (empty for detached): " (funcall piem-default-branch-function info))) @@ -578,8 +584,11 @@ If CODEREPO is given, switch to this directory before calling (let ((args (cons (concat "--patch-format=" format) piem-am-args))) (if (bufferp mbox) - (apply #'piem-process-call-with-buffer-input - nil mbox piem-git-executable "am" args) + (unwind-protect + (apply #'piem-process-call-with-buffer-input + nil mbox piem-git-executable "am" args) + (when interactivep + (kill-buffer mbox))) (apply #'piem-process-call nil piem-git-executable "am" (append args (list mbox))))) (if (and piem-use-magit |