branch: elpa/telephone-line
commit 14d2abdbe05a19fc259961875a4c3db3317b8ffe
Merge: 5968746a49 cbaf1b8134
Author: Daniel Bordak <[email protected]>
Commit: GitHub <[email protected]>
Merge branch 'master' into master
---
telephone-line-segments.el | 73 +++++++++++++++++++++++-----------------------
1 file changed, 36 insertions(+), 37 deletions(-)
diff --git a/telephone-line-segments.el b/telephone-line-segments.el
index 258d5dd329..1622cfe342 100644
--- a/telephone-line-segments.el
+++ b/telephone-line-segments.el
@@ -116,43 +116,42 @@ mouse-3: Toggle minor modes"
'mouse-1 (lambda ()
(interactive)
(projectile-switch-project))))))
-
-(eval-after-load 'evil
- '(telephone-line-defsegment* telephone-line-evil-tag-segment ()
- (let ((tag (cond
- ((not (evil-visual-state-p)) (upcase (symbol-name
evil-state)))
- ((eq evil-visual-selection 'block)
- (if telephone-line-evil-use-short-tag "VB" "V-BLOCK"))
- ((eq evil-visual-selection 'line)
- (if telephone-line-evil-use-short-tag "VL" "V-LINE"))
- (t "VISUAL"))))
- (if telephone-line-evil-use-short-tag
- (seq-take tag 2)
- tag))))
-
-(eval-after-load 'xah-fly-keys
- '(telephone-line-defsegment* telephone-line-xah-fly-keys-segment ()
- (let ((tag (if xah-fly-insert-state-q
- "INSERT" "COMMAND")))
- (if telephone-line-evil-use-short-tag
- (seq-take tag 1)
- tag))))
-
-(eval-after-load 'ryo-modal
- '(telephone-line-defsegment* telephone-line-ryo-modal-segment ()
- (let ((tag (if ryo-modal-mode
- "RYO" "EMACS")))
- (if telephone-line-evil-use-short-tag
- (seq-take tag 1)
- tag))))
-
-(eval-after-load 'workgroups2
- '(telephone-line-defsegment* telephone-line-workgroups2-segment ()
- (telephone-line-raw (wg-mode-line-string) t)))
-
-(eval-after-load 'nyan-mode
- '(telephone-line-defsegment* telephone-line-nyan-segment ()
- (nyan-create)))
+
+(telephone-line-defsegment* telephone-line-evil-tag-segment ()
+ (when (bound-and-true-p evil-mode)
+ (let ((tag (cond
+ ((not (evil-visual-state-p)) (upcase (symbol-name evil-state)))
+ ((eq evil-visual-selection 'block)
+ (if telephone-line-evil-use-short-tag "VB" "V-BLOCK"))
+ ((eq evil-visual-selection 'line)
+ (if telephone-line-evil-use-short-tag "VL" "V-LINE"))
+ (t "VISUAL"))))
+ (if telephone-line-evil-use-short-tag
+ (seq-take tag 2)
+ tag))))
+
+(telephone-line-defsegment* telephone-line-xah-fly-keys-segment ()
+ (when (boundp xah-fly-insert-state-q)
+ (let ((tag (if xah-fly-insert-state-q
+ "INSERT" "COMMAND")))
+ (if telephone-line-evil-use-short-tag
+ (seq-take tag 1)
+ tag))))
+
+(telephone-line-defsegment* telephone-line-ryo-modal-segment ()
+ (let ((tag (if (bound-and-true-p ryo-modal-mode)
+ "RYO" "EMACS")))
+ (if telephone-line-evil-use-short-tag
+ (seq-take tag 1)
+ tag)))
+
+(telephone-line-defsegment* telephone-line-workgroups2-segment ()
+ (when (bound-and-true-p workgroups-mode)
+ (telephone-line-raw (wg-mode-line-string) t)))
+
+(telephone-line-defsegment* telephone-line-nyan-segment ()
+ (when (bound-and-true-p nyan-mode)
+ (nyan-create)))
(provide 'telephone-line-segments)
;;; telephone-line-segments.el ends here
