From 58ea97f6eaf6641a14888ab424874461289f2496 Mon Sep 17 00:00:00 2001
From: Jessie Hildebrandt <jessieh@jessieh.net>
Date: Fri, 3 Sep 2021 05:12:06 -0400
Subject: [PATCH] Improve mode-line format restoration behavior

---
 mood-line.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mood-line.el b/mood-line.el
index 7dbd512..eb62f14 100644
--- a/mood-line.el
+++ b/mood-line.el
@@ -303,7 +303,7 @@
 ;;
 
 ;; Store the default mode-line format
-(defvar mood-line--default-mode-line mode-line-format)
+(defvar-local mood-line--default-mode-line mode-line-format)
 
 ;;;###autoload
 (define-minor-mode mood-line-mode
@@ -323,6 +323,9 @@
         (add-hook 'after-save-hook #'mood-line--update-vc-segment)
         (advice-add #'vc-refresh-state :after #'mood-line--update-vc-segment)
 
+        ;; Save previous mode-line-format to be restored later
+        (setq mood-line--default-mode-line mode-line-format)
+
         ;; Set the new mode-line-format
         (setq-default mode-line-format
                       '((:eval