branch: master
commit 39759cfb571d8ff5768baea8d9833387ef2140e2
Author: Oleh Krehel <ohwoeo...@gmail.com>
Commit: Oleh Krehel <ohwoeo...@gmail.com>
ivy-test.el (ivy-with): Save current buffer
---
ivy-test.el | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/ivy-test.el b/ivy-test.el
index 712467f..aa0d7b4 100644
--- a/ivy-test.el
+++ b/ivy-test.el
@@ -51,14 +51,18 @@
(cl-defun ivy-with (expr keys &key dir)
"Evaluate EXPR followed by KEYS."
(let ((ivy-expr expr)
- (inhibit-message t))
+ (inhibit-message t)
+ (buf (current-buffer)))
(save-window-excursion
- ;; `execute-kbd-macro' doesn't pick up `default-directory'
- (when dir
- (dired (expand-file-name dir (counsel-locate-git-root))))
- (execute-kbd-macro
- (vconcat (kbd "C-c e")
- (kbd keys))))
+ (unwind-protect
+ (progn
+ ;; `execute-kbd-macro' doesn't pick up `default-directory'
+ (when dir
+ (dired (expand-file-name dir (counsel-locate-git-root))))
+ (execute-kbd-macro
+ (vconcat (kbd "C-c e")
+ (kbd keys))))
+ (switch-to-buffer buf)))
ivy-result))
(defun command-execute-setting-this-command (cmd &rest args)
