branch: externals/ebdb
commit 8f82b0f42a89a5945b62e99f10bdeff859816f43
Author: Eric Abrahamsen <[email protected]>
Commit: Eric Abrahamsen <[email protected]>
Complete changes from ed3e270
* ebdb-com.el (ebdb-pop-up-window): Was accessing the elements of
"pop" arg incorrectly.
* ebdb-gnus.el (ebdb-popup-window): Only one of the method was using
the new return signature.
---
ebdb-com.el | 6 +++---
ebdb-gnus.el | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ebdb-com.el b/ebdb-com.el
index ecfafb2..5441f34 100644
--- a/ebdb-com.el
+++ b/ebdb-com.el
@@ -964,16 +964,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 (or (cadr pop)
+ (horiz/vert (or (caddr pop)
(if (> (window-total-width split-window)
(window-total-height split-window))
'horiz
'vert)))
(size (cond ((null pop)
nil)
- ((integerp (caddr pop)))
+ ((integerp (cadr pop)))
(t
- (let ((ratio (- 1 (or (caddr pop) 0.5)))
+ (let ((ratio (- 1 (or (cadr pop) 0.5)))
(dimension (max (window-total-width split-window)
(window-total-height
split-window))))
(round (* dimension ratio)))))))
diff --git a/ebdb-gnus.el b/ebdb-gnus.el
index cf5389c..eef83d1 100644
--- a/ebdb-gnus.el
+++ b/ebdb-gnus.el
@@ -419,7 +419,7 @@ Note that `\( is the backquote, NOT the quote '\(."
(unless (gnus-buffer-live-p gnus-article-buffer)
(gnus-summary-show-article))
(get-buffer-window gnus-article-buffer))))
- (list win nil 0.3)))
+ (list win 0.3)))
(cl-defmethod ebdb-popup-window (&context (major-mode gnus-article-mode))
(list (get-buffer-window) 0.3))
