;;; icomplete.el --- minibuffer completion incremental feedback
-;; Copyright (C) 1992, 1993, 1994, 1997, 1999, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1992-1994, 1997, 1999, 2001-2011
+;; Free Software Foundation, Inc.
;; Author: Ken Manheimer <klm@i.am>
;; Maintainer: Ken Manheimer <klm@i.am>
:prefix "icomplete-"
:group 'minibuffer)
+(defvar icomplete-prospects-length 80)
+(make-obsolete-variable
+ 'icomplete-prospects-length 'icomplete-prospects-height "23.1")
+
;;;_* User Customization variables
-(defcustom icomplete-prospects-length 80
- "Length of string displaying the prospects."
+(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)))
+ "Maximum number of lines to use in the minibuffer."
:type 'integer
- :group 'icomplete)
+ :group 'icomplete
+ :version "23.1")
(defcustom icomplete-compute-delay .3
"Completions-computation stall, used only with large-number completions.
(add-hook 'icomplete-post-command-hook 'icomplete-exhibit)
(defun icomplete-get-keys (func-name)
- "Return strings naming keys bound to `func-name', or nil if none.
+ "Return strings naming keys bound to FUNC-NAME, or nil if none.
Examines the prior, not current, buffer, presuming that current buffer
is minibuffer."
- (if (commandp func-name)
+ (when (commandp func-name)
(save-excursion
(let* ((sym (intern func-name))
(buf (other-buffer nil t))
(keys (with-current-buffer buf (where-is-internal sym))))
- (if keys
- (concat "<"
- (mapconcat 'key-description
- (sort keys
- #'(lambda (x y)
- (< (length x) (length y))))
- ", ")
- ">"))))))
+ (when keys
+ (concat "<"
+ (mapconcat 'key-description
+ (sort keys
+ #'(lambda (x y)
+ (< (length x) (length y))))
+ ", ")
+ ">"))))))
;;;_ = icomplete-with-completion-tables
(defvar icomplete-with-completion-tables '(internal-complete-buffer)
"Specialized completion tables with which icomplete should operate.
(if icomplete-mode
;; The following is not really necessary after first time -
;; no great loss.
- (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)
- (remove-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)))
+ (progn
+ (setq completion-show-inline-help nil)
+ (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup))
+ (remove-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)
+ (setq completion-show-inline-help t)))
;;;_ > icomplete-simple-completing-p ()
(defun icomplete-simple-completing-p ()
matches exist. \(Keybindings for uniquely matched commands
are exhibited within the square braces.)"
- (let* ((comps (completion-all-sorted-completions))
+ (let* ((non-essential t)
+ (comps (completion-all-sorted-completions))
(last (if (consp comps) (last comps)))
(base-size (cdr last))
(open-bracket (if require-match "(" "["))
(close-bracket (if require-match ")" "]")))
- ;; `concat'/`mapconcat' is the slow part. With the introduction of
- ;; `icomplete-prospects-length', there is no need for `catch'/`throw'.
+ ;; `concat'/`mapconcat' is the slow part.
(if (not (consp comps))
(format " %sNo matches%s" open-bracket close-bracket)
(if last (setcdr last nil))
(t (concat "..." (substring most compare))))
close-bracket)))
;;"-prospects" - more than one candidate
- (prospects-len (+ (length determ) 6)) ;; take {,...} into account
+ (prospects-len (+ (length determ) 6 ;; take {,...} into account
+ (string-width (buffer-string))))
+ (prospects-max
+ ;; Max total length to use, including the minibuffer content.
+ (* (+ icomplete-prospects-height
+ ;; If the minibuffer content already uses up more than
+ ;; one line, increase the allowable space accordingly.
+ (/ prospects-len (window-width)))
+ (window-width)))
(prefix-len
;; Find the common prefix among `comps'.
(if (eq t (compare-strings (car comps) nil (length most)
comps (cdr comps))
(cond ((string-equal comp "") (setq most-is-exact t))
((member comp prospects))
- (t (setq prospects-len (+ (length comp) 1 prospects-len))
- (if (< prospects-len icomplete-prospects-length)
+ (t (setq prospects-len
+ (+ (string-width comp) 1 prospects-len))
+ (if (< prospects-len prospects-max)
(push comp prospects)
(setq limit t))))))
;; Restore the base-size info, since completion-all-sorted-completions
;;allout-layout: (-2 :)
;;End:
-;; arch-tag: 339ec25a-0741-4eb6-be63-997532e89b0f
;;; icomplete.el ends here