From d68c0fd5b5e3ca6284d90e31f367eaeeb234626c Mon Sep 17 00:00:00 2001
From: Sean Farley <sean@farley.io>
Date: Tue, 12 May 2020 22:34:19 -0700
Subject: [PATCH] mu4e-main: decode strings as utf-8

This fixes both bookmarks and maildirs with non-ASCII names. Thanks to
@scturtle for pointing this out!
---
 mu4e/mu4e-main.el | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/mu4e/mu4e-main.el b/mu4e/mu4e-main.el
index 1a171759..5c695944 100644
--- a/mu4e/mu4e-main.el
+++ b/mu4e/mu4e-main.el
@@ -129,7 +129,10 @@ clicked."
            for query = (plist-get bm :query)
            for qcounts = (and (stringp query)
                               (cl-loop for q in queries
-                                       when (string= (plist-get q :query) query)
+                                       when (string=
+                                             (decode-coding-string
+                                              (plist-get q :query) 'utf-8 t)
+                                             query)
                                        collect q))
            when (not (plist-get bm :hide))
            concat (concat
@@ -162,7 +165,11 @@ clicked."
            for query = (plist-get m :query)
            for qcounts = (and (stringp query)
                               (cl-loop for q in queries
-                                       when (string= (plist-get q :query) query)
+                                       when (string=
+                                             (decode-coding-string
+                                              (plist-get q :query)
+                                              'utf-8 t)
+                                             query)
                                        collect q))
            when (not (plist-get m :hide))
            concat (concat