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

1 files changed, 6 insertions, 3 deletions

diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 02e63c7e463..83dd176f984 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -942,10 +942,13 @@ To find the XFLD name for a font, you can execute the following in the
 (x-select-font nil t)
 @end example
 
-To see a complete list of fonts, execute the following in the
-@file{*scratch*} buffer by pressing C-x C-e at the end of the line:
+To see a complete list of fonts, execute the following Lisp snippet by
+typing it into the @file{*scratch*} buffer and pressing @w{@kbd{C-x
+C-e}} at the end of the second line:
+
 @example
-(insert (prin1-to-string (x-list-fonts "*")))
+(dolist (font (x-list-fonts "*"))
+  (insert (format "%s\n" font)))
 @end example
 
 The command line options and frame-parameters for changing the default font