From 20c8c2d117de3cd8ef264f8ca0ceefc38a8f3d21 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Tue, 18 May 2021 02:29:48 +0100
Subject: jao-minibuffer: more robust updating on window selection

---
 init.org                  | 5 ++---
 lib/eos/jao-minibuffer.el | 8 +++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/init.org b/init.org
index 50a6356..12f12be 100644
--- a/init.org
+++ b/init.org
@@ -484,8 +484,8 @@
         (setq jao-exwm-enabled-p t)
         (display-time-mode -1)
         (jao-ednc-setup 95)
-        ;; (jao-minibuffer-add-mode-line 90)
-        (jao-toggle-inactive-mode-line t)
+        (jao-minibuffer-add-mode-line 90)
+        ;; (jao-toggle-inactive-mode-line t)
         (exwm-enable)
         (jao-trisect t)
         (jao-exwm-xmobar)
@@ -1253,7 +1253,6 @@
                     'face 'font-lock-warning-face))
 
       (add-hook 'jao-afio-switch-hook #'tracking-remove-visible-buffers)
-      (add-hook 'jao-afio-switch-hook #'jao-minibuffer-refresh t)
       (jao-minibuffer-add-variable '(jao-current--frame-id) 100)
     #+end_src
 * Writing and writing modes
diff --git a/lib/eos/jao-minibuffer.el b/lib/eos/jao-minibuffer.el
index cb2fd25..0a9b391 100644
--- a/lib/eos/jao-minibuffer.el
+++ b/lib/eos/jao-minibuffer.el
@@ -102,7 +102,6 @@
 (defconst jao-minibuffer--circe
   '(circe-chat-target (:eval (format " [%d]" (length (circe-channel-nicks))))))
 
-(defvar repeat-in-progress nil)
 (defvar w3m-current-title nil)
 
 (defvar jao-minibuffer--mode-line-format
@@ -115,7 +114,7 @@
                  (t "%b")))
     "%]"
     (:propertize ,jao-minibuffer--circe face jao-themes-dimm)
-    " %+ "
+    " %*%+ "
     (:propertize mode-name face jao-themes-f00)
     (:propertize ("" minor-mode-alist (vc-mode vc-mode)) face jao-themes-f11)
     (:propertize (doc-view-doc-type
@@ -124,6 +123,8 @@
                  face jao-themes-f12)
     global-mode-string))
 
+(defvar jao-minibuffer--original-modeline nil)
+
 (defun jao-minibuffer--add-variable (list-name variable-name &optional order)
   (let ((v `(:eval ,variable-name)))
     (setq jao-minibuffer-info (remove v jao-minibuffer-info))
@@ -139,13 +140,14 @@
 
 ;;;###autoload
 (defun jao-minibuffer-add-mode-line (order)
+  (setq jao-minibuffer--original-modeline mode-line-format)
   (setq-default mode-line-format '(" "))
   (set-face-attribute 'mode-line nil :box nil :height 1
                       :background jao-minibuffer-active-buffer-line-color)
   (set-face-attribute 'mode-line-inactive nil :box nil :height 1
                       :background jao-minibuffer-inactive-buffer-line-color)
   (advice-add 'force-mode-line-update :after #'jao-minibuffer-refresh)
-  (add-hook 'buffer-list-update-hook #'jao-minibuffer-refresh)
+  (advice-add 'select-window :after #'jao-minibuffer-refresh)
   (jao-minibuffer-add-variable 'jao-minibuffer--mode-line-format order))
 
 ;;;###autoload
-- 
cgit v1.2.3