Subject: [PATCH 1/1] lisp/gnus/nnir.el: prefer $MAILDIR over $HOME/Mail as notmuch prefix

From: Philip K <[email-masked]>
Date: Thu, 21 Mar 2019 21:49:17 +0100

---
 lisp/gnus/nnir.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 37a38a58d4..34f741bb60 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -507,7 +507,8 @@ nnir-notmuch-additional-switches
   :type '(repeat (string))
   :group 'nnir)
 
-(defcustom nnir-notmuch-remove-prefix (concat (getenv "HOME") "/Mail/")
+(defcustom nnir-notmuch-remove-prefix (or (getenv "MAILDIR")
+										  (concat (getenv "HOME") "/Mail/"))
   "The prefix to remove from each file name returned by notmuch
 in order to get a group name (albeit with / instead of .).  This is a
 regular expression.
-- 
2.20.1