From b878a52df80d92aaff841327b5f705e943a00710 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 13 Oct 2015 00:46:47 -0400 Subject: [PATCH] narf/kill-real-buffer compatibility with popwin --- core/lib/defuns-buffers.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/lib/defuns-buffers.el b/core/lib/defuns-buffers.el index 007e7da00..d9888e047 100644 --- a/core/lib/defuns-buffers.el +++ b/core/lib/defuns-buffers.el @@ -87,8 +87,11 @@ Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/" (cond ((string-match-p "^\\*scratch\\*" bname) (erase-buffer)) (t (kill-this-buffer)))) - (unless (narf/real-buffer-p (current-buffer)) - (narf/previous-real-buffer))) + (if (and (eq (current-buffer) popwin:popup-buffer) + (popwin:popup-window-live-p)) + (popwin:close-popup-window) + (unless (narf/real-buffer-p (current-buffer)) + (narf/previous-real-buffer)))) ;;;###autoload (defun narf:kill-unreal-buffers ()