From: Karel Zak <kzak@redhat.com>
Date: Wed, 14 Dec 2011 15:34:26 +0000 (+0100)
Subject: don't modify virtual folders' paths
X-Git-Tag: neomutt-20160404~13^2~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c58f3c2d68fc08a9e98d6ef93883d3f49fb22a37;p=neomutt

don't modify virtual folders' paths

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/muttlib.c b/muttlib.c
index 350714f8d..58badfe91 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -440,6 +440,11 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
 	     Maildir[strlen (Maildir) - 1] == '/'))
 	  strfcpy (p, NONULL (Maildir), sizeof (p));
 	else
+#endif
+#ifdef USE_NOTMUCH
+	if (mx_is_notmuch (NONULL (Maildir)))
+	  strfcpy (p, NONULL (Maildir), sizeof (p));
+	else
 #endif
 	if (Maildir && *Maildir && Maildir[strlen (Maildir) - 1] == '/')
 	  strfcpy (p, NONULL (Maildir), sizeof (p));
@@ -887,6 +892,11 @@ void mutt_pretty_mailbox (char *s, size_t buflen)
   }
 #endif
 
+#ifdef USE_NOTMUCH
+  if (scheme == U_NOTMUCH)
+    return;
+#endif
+
   /* if s is an url, only collapse path component */
   if (scheme != U_UNKNOWN)
   {