branch: externals/ebdb
commit dd1381388484efe9eed524d55f163bfb3b45c218
Author: Eric Abrahamsen <[email protected]>
Commit: Eric Abrahamsen <[email protected]>
Bah, fixups to a19ff0a
* ebdb-com.el (ebdb-pop-up-window): Compile and test first, why don't
you?
---
ebdb-com.el | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ebdb-com.el b/ebdb-com.el
index 0745f56..4d3c712 100644
--- a/ebdb-com.el
+++ b/ebdb-com.el
@@ -973,15 +973,16 @@ If the whole POP argument is nil, just re-use the current
buffer."
(let* ((split-window (car-safe pop))
(buffer-window (get-buffer-window buf t))
- (horiz/vert (if (> (window-total-width split-window)
- (window-total-height split-window))
+ (horiz/vert (if (and split-window
+ (> (window-total-width split-window)
+ (window-total-height split-window)))
'horiz
'vert)))
(cond (buffer-window
;; It's already visible, re-use it.
nil)
- ((and (null split-window) (null size))
+ ((null pop)
;; Not splitting, but buffer isn't visible, just take up
;; the whole window.
(set-window-buffer (selected-window) buf)
