From 3ac71ecfbead1d8f1cbeeb09bca9160316a9e266 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Sun, 15 Mar 2020 00:58:31 +0200
Subject: [PATCH] mu4e: restore mu4e-index-cleanup t

Let's go back to the old default.
---
 NEWS.org          | 9 ---------
 mu4e/mu4e-vars.el | 8 +++-----
 mu4e/mu4e.texi    | 4 +++-
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index 5c7da37b..7f757dab 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -89,15 +89,6 @@
       with a repl for testing. If you have readline installed, you also get
       history etc.
 
-    - mu4e now defaults to _not_ doing a cleanup after indexing; see
-      ~mu4e-index-cleanup~; reason is that some users have slow (file)systems,
-      making the index operation unnecessary lengthy. More over, files that do not exist
-      are excluded during querying.
-
-      It is recommended to occasionally still clean up the database, perhaps by
-      closing mu4e and calling ~mu index~ from the command-line; this is esp. true
-      if other programs are working in your maildir, behind mu's back.
-
 *** toys
 
     - Updated the ~mug~ toy UI to use Webkit2/GTK+. Note that this is just a toy
diff --git a/mu4e/mu4e-vars.el b/mu4e/mu4e-vars.el
index a49b6868..4469eafe 100644
--- a/mu4e/mu4e-vars.el
+++ b/mu4e/mu4e-vars.el
@@ -96,19 +96,17 @@ This depends on the `mu4e-get-mail-command' exit code."
   :group 'mu4e
   :safe 'booleanp)
 
-(defcustom mu4e-index-cleanup nil
+(defcustom mu4e-index-cleanup t
   "Whether to run a cleanup phase after indexing.
 
 That is, validate that each message in the message store has a
 corresponding message file in the filesystem.
 
 Having this option as t ensures that no non-existing messages are
-shown but can also be quite slow with large message stores, and
-especially with slow filesystems."
+shown but can slow with large message stores on slow file-systems."
   :type 'boolean
   :group 'mu4e
-  :safe 'booleanp
-  :version "1.3.9")
+  :safe 'booleanp)
 
 (defcustom mu4e-index-lazy-check nil
   "Whether to only use a 'lazy check' during reindexing.
diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi
index 5a954e26..db4fad9b 100644
--- a/mu4e/mu4e.texi
+++ b/mu4e/mu4e.texi
@@ -584,10 +584,12 @@ messages, even if other programs have modified the Maildir.
 
 The downside of this thoroughness (which is the default) is that it is
 relatively slow, something that can be noticeable with large e-mail
-corpa. For a faster approach, you can use the following:
+corpa on slow file-systems. For a faster approach, you can use the
+following:
 
 @lisp
 (setq
+  mu4e-index-cleanup nil      ;; don't do a full cleanup check
   mu4e-index-lazy-check t)    ;; don't consider up-to-date dirs
 @end lisp