Merge from origin/emacs-27
145a151d62
Correct Fido-mode's backspacing of directories with spaces660b9b8cfb
Default completion-flex-nospace to nilfb5f616ae8
Improve an example in w32 FAQ
This commit is contained in:
commit
2a4cb2459b
3 changed files with 9 additions and 5 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Reference in a new issue