From 660b9b8cfbfff8f94d1e9e0a701d5f94d05d4221 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Wed, 15 Apr 2020 18:41:53 +0100
Subject: [PATCH] Default completion-flex-nospace to nil

By default, the flex completion style _does_ match spaces.

Fixes: bug#40625

* lisp/icomplete.el (icomplete--fido-mode-setup): Force
completion-flex-nospace to nil.

* lisp/minibuffer.el (completion-flex-nospace): Default to nil.
---
 lisp/icomplete.el  | 1 +
 lisp/minibuffer.el | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 66bc731f67f..ac14a850d4d 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -329,6 +329,7 @@ if that doesn't produce a completion match."
                 icomplete-show-matches-on-no-input t
                 icomplete-hide-common-prefix nil
                 completion-styles '(flex)
+                completion-flex-nospace nil
                 completion-category-defaults nil)))
 
 ;;;###autoload
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 7f5b597542a..b81f778eb4f 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -3607,7 +3607,7 @@ that is non-nil."
 ;;; "flex" completion, also known as flx/fuzzy/scatter completion
 ;; Completes "foo" to "frodo" and "farfromsober"
 
-(defcustom completion-flex-nospace t
+(defcustom completion-flex-nospace nil
   "Non-nil if `flex' completion rejects spaces in search pattern."
   :version "27.1"
   :type 'boolean)
-- 
2.39.2