(Emacs/config)~Fix up some stuff in mode line

Emacs/.config/emacs/config.org

@@ -324,14 +324,14 @@ the mode line to achieve this.
           )
         +better-mode-line/right-segment  ;; RIGHT SEGMENT
         '((:eval (if (project-current)         ;; Name of current project (if any)
-	                   (project-name
-                      (project-current))))
-          (vc-mode vc-mode)                    ;; Git branch (if any)
-          "    "
+	                   (concat (project-name
+                              (project-current))
+                             vc-mode)          ;; ... with git branch
+                   ""))
           (:eval                               ;; LSP information
            (with-eval-after-load "eglot"
              (if eglot--managed-mode
-                 (eglot--mode-line-format))))
+                 (concat "    " (eglot--mode-line-format)))))
           mode-line-misc-info                  ;; Any other information
           ))
   :config

Emacs/.config/emacs/elisp/better-mode-line.el

@@ -27,18 +27,6 @@
 
 ;;; Code:
 
-(defun +better-mode-line/evil-state ()
-  "Returns either the empty string if no evil-state is defined or
-the first character of the evil state capitalised"
-  (with-eval-after-load "evil"
-    (if (bound-and-true-p evil-state)
-        (upcase
-         (substring
-	        (format "%s"
-			            evil-state)
-          0 1))
-      "")))
-
 (defvar +better-mode-line/left-segment nil
   "List of elements that are placed on the left of the mode-line")
 
@@ -51,6 +39,18 @@ the first character of the evil state capitalised"
 (defconst +better-mode-line/--minimum-padding 4
   "Minimum size of padding string.")
 
+(defun +better-mode-line/evil-state ()
+  "Returns either the empty string if no evil-state is defined or
+the first character of the evil state capitalised"
+  (with-eval-after-load "evil"
+    (if (bound-and-true-p evil-state)
+        (upcase
+         (substring
+	        (format "%s"
+			            evil-state)
+          0 1))
+      "")))
+
 (defun +better-mode-line/--get-padding-size (centre-size other-size)
   (let* ((win-width (window-width))
          (margins (window-margins))