branch: elpa/keycast
commit 310e70780dcac8de93b4f84e5ed6b5eb785b4023
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
Move definitions of location predicates
---
keycast.el | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/keycast.el b/keycast.el
index ccfa12402b..7bdb1fc464 100644
--- a/keycast.el
+++ b/keycast.el
@@ -278,6 +278,21 @@ instead."
(advice-add 'read-passwd :around #'keycast--read-passwd)
+(defun keycast-bottom-right-window-p ()
+ (and (window-at-side-p nil 'right)
+ (window-at-side-p nil 'bottom)))
+
+(defun keycast-active-frame-bottom-right-p ()
+ (and (keycast-bottom-right-window-p)
+ (keycast--active-frame-p)))
+
+(defun keycast--active-frame-p ()
+ (cond ((boundp 'moody--active-window)
+ (eq (window-frame) (window-frame moody--active-window)))
+ ((boundp 'powerline-selected-window)
+ (eq (window-frame) (window-frame powerline-selected-window)))
+ (t t)))
+
;;; Mode-Line
(defvar keycast--removed-tail nil)
@@ -319,21 +334,6 @@ instead."
(keycast--tree-member elt sub))))
(throw 'found found))))))
-(defun keycast-bottom-right-window-p ()
- (and (window-at-side-p nil 'right)
- (window-at-side-p nil 'bottom)))
-
-(defun keycast-active-frame-bottom-right-p ()
- (and (keycast-bottom-right-window-p)
- (keycast--active-frame-p)))
-
-(defun keycast--active-frame-p ()
- (cond ((boundp 'moody--active-window)
- (eq (window-frame) (window-frame moody--active-window)))
- ((boundp 'powerline-selected-window)
- (eq (window-frame) (window-frame powerline-selected-window)))
- (t t)))
-
(defvar keycast-mode-line
'(:eval
(and (funcall keycast-mode-line-window-predicate)
