1 files changed, 12 insertions, 10 deletions

@@ -347,7 +347,7 @@ The order of elements matters: whichever one matches first is applied."
 (defun +modeline-line (&optional spacer)
   (when line-number-mode
     (+modeline-spacer nil spacer
-      "%l")))
+      "%3l")))
 
 (defun +modeline-column (&optional spacer)
   (when column-number-mode
@@ -367,8 +367,8 @@ See `line-number-mode', `column-number-mode', and
 `file-percentage-mode'.  If `+modeline-position-function' is set
 to a function in the current buffer, call that function instead."
   (cond ((functionp +modeline-position-function)
-         (+modeline-spacer nil spacer
-           (funcall +modeline-position-function)))
+         (when-let* ((str (funcall +modeline-position-function)))
+           (+modeline-spacer nil spacer str)))
         (t (funcall (+modeline-concat '(+modeline-region
                                         +modeline-line
                                         +modeline-column
@@ -378,10 +378,9 @@ to a function in the current buffer, call that function instead."
 (defun +modeline-vc (&optional spacer)
   "Display the version control branch of the current buffer in the modeline."
   ;; from https://www.gonsie.com/blorg/modeline.html, from Doom
-  (if-let ((backend (vc-backend buffer-file-name)))
+  (when-let ((backend (vc-backend buffer-file-name)))
       (+modeline-spacer nil spacer
-        (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2)))
-    ""))
+        (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2)))))
 
 (defun +modeline-track (&optional spacer)
   "Display `tracking-mode' information."
@@ -473,13 +472,16 @@ to a function in the current buffer, call that function instead."
                                                      (kmacro-end-macro nil)))))
                   'mouse-face 'mode-line-highlight))))
 
+(defface +nyan-mode-line nil
+  "Face for nyan-cat in mode line.")
+
 (defun +modeline-nyan-on-focused (&optional spacer)
   "Display the cat from `nyan-mode', but only on the focused window."
   (require 'nyan-mode)
-  (when (actually-selected-window-p)
-    (concat (or spacer "") (nyan-create)
-            (propertize "."
-                        'face 'font-lock-comment-face))))
+  (when (and (or nyan-mode (bound-and-true-p +nyan-local-mode))
+             (actually-selected-window-p))
+    (+modeline-spacer nil spacer
+      (propertize (nyan-create) 'face '+nyan-mode-line))))
 
 (provide '+modeline)
 ;;; +modeline.el ends here