path: fix expansion of bare + and =

diff --git a/mx.c b/mx.c
index 298580a9833b2bae7b34bd222955a5dd498146d3..bbbc21e14f91ce4b3d73ae70d4db21a2e9cb0066 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -1437,6 +1437,11 @@ int mx_path_canon(char *buf, size_t buflen, const char *folder, int *magic)
         mutt_str_inline_replace(buf, buflen, 2, LastFolder);
       }
     }
+    else if ((buf[0] == '+') || (buf[0] == '='))
+    {
+      buf[0] = '/';
+      mutt_str_inline_replace(buf, buflen, 0, Folder);
+    }
     else if ((buf[1] == '/') || (buf[1] == '\0'))
     {
       if (buf[0] == '!')
@@ -1464,11 +1469,6 @@ int mx_path_canon(char *buf, size_t buflen, const char *folder, int *magic)
         mutt_str_inline_replace(buf, buflen, 1, HomeDir);
       }
     }
-    else if ((buf[0] == '+') || (buf[0] == '='))
-    {
-      buf[0] = '/';
-      mutt_str_inline_replace(buf, buflen, 0, Folder);
-    }
     else if (buf[0] == '@')
     {
       /* elm compatibility, @ expands alias to user name */