1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-05 20:43:08 +00:00

Give a fixed default value for icomplete-prospects-height (Bug#26939)

* lisp/icomplete.el (icomplete-prospects-height): Default to 2.
(icomplete-prospects-length): Remove.
* etc/NEWS: Announce removal.
This commit is contained in:
Noam Postavsky 2017-06-05 19:18:14 -04:00
parent 32d8dba625
commit 5647c4a2c6
2 changed files with 7 additions and 9 deletions

View File

@ -932,6 +932,7 @@ of not providing replacement pairs via the history.
*** make-variable-frame-local. Variables cannot be frame-local any more.
*** From subr.el: window-dot, set-window-dot, read-input, show-buffer,
eval-current-buffer, string-to-int
*** icomplete-prospects-length.
*** All the default-FOO variables that hold the default value of the
FOO variable. Use 'default-value' and 'setq-default' to access and
change FOO, respectively. The exhaustive list of removed variables is:

View File

@ -56,10 +56,6 @@
:link '(info-link "(emacs)Icomplete")
:group 'minibuffer)
(defvar icomplete-prospects-length 80)
(make-obsolete-variable
'icomplete-prospects-length 'icomplete-prospects-height "23.1")
(defcustom icomplete-separator " | "
"String used by Icomplete to separate alternatives in the minibuffer."
:type 'string
@ -91,13 +87,14 @@ Otherwise this should be a list of the completion tables (e.g.,
:version "24.4")
;;;_* User Customization variables
(defcustom icomplete-prospects-height
;; 20 is an estimated common size for the prompt + minibuffer content, to
;; try to guess the number of lines used up by icomplete-prospects-length.
(+ 1 (/ (+ icomplete-prospects-length 20) (window-width)))
(defcustom icomplete-prospects-height 2
;; We used to compute how many lines 100 characters would take in
;; the current window width, but the return value of `window-width'
;; is unreliable on startup (e.g., if we're in daemon mode), so now
;; we simply base the default value on an 80 column window.
"Maximum number of lines to use in the minibuffer."
:type 'integer
:version "23.1")
:version "26.1")
(defcustom icomplete-compute-delay .3
"Completions-computation stall, used only with large-number completions.