[nongnu] elpa/telephone-line 220a1a4a89 141/195: Update defaults + unify config

[ELPA Syncer]

branch: elpa/telephone-line
commit 220a1a4a89ca95be9ae1fab356b92296fff5b73a
Author: Daniel Bordak <dbordak@fastmail.fm>
Commit: Daniel Bordak <dbordak@fastmail.fm>

    Update defaults + unify config
---
 readme.org               |  9 ---------
 telephone-line-config.el | 15 +--------------
 telephone-line.el        | 15 +++++++++------
 3 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/readme.org b/readme.org
index 627d1d0f23..187d7577a8 100644
--- a/readme.org
+++ b/readme.org
@@ -35,15 +35,6 @@ usual stuff:
 (telephone-line-mode 1)
 #+end_src
 
-If you want to use it with evil, instead you should do this
-
-#+begin_src emacs-lisp
-(require 'telephone-line-config)
-(telephone-line-evil-config)
-#+end_src
-
-This implicitly calls ~(telephone-line-mode 1)~.
-
 * Separator Gallery
 
 abs
diff --git a/telephone-line-config.el b/telephone-line-config.el
index dc785d4f81..02d5bbf698 100644
--- a/telephone-line-config.el
+++ b/telephone-line-config.el
@@ -25,20 +25,7 @@
 
 ;;;###autoload
 (defun telephone-line-evil-config ()
-  "A simple default for using telephone-line with evil."
-  (setq telephone-line-lhs
-        '((evil   . (telephone-line-evil-tag-segment))
-          (accent . (telephone-line-vc-segment
-                     telephone-line-erc-modified-channels-segment
-                     telephone-line-process-segment))
-          (nil    . (telephone-line-minor-mode-segment
-                     telephone-line-buffer-segment))))
-
-  (setq telephone-line-rhs
-        '((nil    . (telephone-line-misc-info-segment))
-          (accent . (telephone-line-major-mode-segment))
-          (evil   . (telephone-line-airline-position-segment))))
-
+  "Deprecated, just call (telephone-line-mode t) instead."
   (telephone-line-mode t))
 
 (provide 'telephone-line-config)
diff --git a/telephone-line.el b/telephone-line.el
index 6ef2a2dd6f..063374779a 100644
--- a/telephone-line.el
+++ b/telephone-line.el
@@ -197,7 +197,7 @@ Secondary separators do not incur a background color 
change."
          (if xah-fly-insert-state-q
              'telephone-line-evil-insert
            'telephone-line-evil-normal))
-        ((not (boundp 'evil-state)) 'mode-line)
+        ((not (bound-and-true-p evil-mode)) 'mode-line)
         (t (intern (concat "telephone-line-evil-" (symbol-name evil-state))))))
 
 ;;TODO: Clean this up
@@ -306,8 +306,11 @@ separators, as they are conditional, are evaluated 
on-the-fly."
       base-width)))
 
 (defcustom telephone-line-lhs
-  '((accent . (telephone-line-vc-segment))
-    (nil    . (telephone-line-minor-mode-segment
+  '((evil   . (telephone-line-evil-tag-segment))
+    (accent . (telephone-line-vc-segment
+               telephone-line-erc-modified-channels-segment
+               telephone-line-process-segment))
+    (nil    . (telephone-line-projectile-segment
                telephone-line-buffer-segment)))
   "Left hand side segment alist."
   :type '(alist :key-type segment-color :value-type subsegment-list)
@@ -326,9 +329,9 @@ separators, as they are conditional, are evaluated 
on-the-fly."
   :group 'telephone-line)
 
 (defcustom telephone-line-rhs
-  '((nil    . (telephone-line-misc-info-segment
-               telephone-line-major-mode-segment))
-    (accent . (telephone-line-airline-position-segment)))
+  '((nil    . (telephone-line-misc-info-segment))
+    (accent . (telephone-line-major-mode-segment))
+    (evil   . (telephone-line-airline-position-segment)))
   "Right hand side segment alist."
   :type '(alist :key-type segment-color :value-type subsegment-list)
   :group 'telephone-line)