From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat, 22 Jun 2019 12:55:06 +0000 (+0200)
Subject: (nnir-notmuch-remove-prefix): Respect MAILDIR
X-Git-Tag: emacs-27.0.90~2317
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d038d31c37b6d06abf09fbe676866ac829256098;p=emacs.git

(nnir-notmuch-remove-prefix): Respect MAILDIR

* lisp/gnus/nnir.el (nnir-notmuch-remove-prefix): Respect MAILDIR
and regexp-quote the result (bug#34940).
---

diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 9d59a4db0da..d66bdf47066 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -507,14 +507,15 @@ Instead, use this:
   :type '(repeat (string))
   :group 'nnir)
 
-(defcustom nnir-notmuch-remove-prefix (concat (getenv "HOME") "/Mail/")
+(defcustom nnir-notmuch-remove-prefix
+  (regexp-quote (or (getenv "MAILDIR") (expand-file-name "~/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.
 
 This variable is very similar to `nnir-namazu-remove-prefix', except
 that it is for notmuch, not Namazu."
-  :version "24.1"
+  :version "27.1"
   :type '(regexp)
   :group 'nnir)