[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2a4cb24 2/4: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master 2a4cb24 2/4: Merge from origin/emacs-27 |
Date: |
Sat, 18 Apr 2020 10:55:23 -0400 (EDT) |
branch: master
commit 2a4cb2459b7c72ea66762a4f62ae8f0a31dec8e3
Merge: a6c3910 145a151
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
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
---
doc/misc/efaq-w32.texi | 9 ++++++---
lisp/icomplete.el | 3 ++-
lisp/minibuffer.el | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 02e63c7..83dd176 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
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 66bc731..c12f390 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 3c8202c..6090e3f 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)