Merge from origin/emacs-27

145a151d62 Correct Fido-mode's backspacing of directories with spaces
660b9b8cfb Default completion-flex-nospace to nil
fb5f616ae8 Improve an example in w32 FAQ

2 files changed, 3 insertions, 2 deletions

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 66bc731f67f..c12f3901f09 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -300,7 +300,7 @@ if that doesn't produce a completion match."
   (interactive)
   (if (and (eq (char-before) ?/)
            (eq (icomplete--category) 'file))
-      (backward-kill-sexp 1)
+      (zap-up-to-char -1 ?/)
     (call-interactively 'backward-delete-char)))
 
 (defvar icomplete-fido-mode-map
@@ -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 3c8202c7eb9..6090e3f74ed 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -3611,7 +3611,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)