HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* dired-aux.el (dired-diff): Doc fixup (bug#8816).
[bpt/emacs.git]
/
lisp
/
icomplete.el
diff --git
a/lisp/icomplete.el
b/lisp/icomplete.el
index
5e2639b
..
5f36806
100644
(file)
--- a/
lisp/icomplete.el
+++ b/
lisp/icomplete.el
@@
-1,7
+1,7
@@
;;; icomplete.el --- minibuffer completion incremental feedback
;;; 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>
;; Author: Ken Manheimer <klm@i.am>
;; Maintainer: Ken Manheimer <klm@i.am>
@@
-77,7
+77,9
@@
;; 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."
;; 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)
+ :type 'integer
+ :group 'icomplete
+ :version "23.1")
(defcustom icomplete-compute-delay .3
"Completions-computation stall, used only with large-number completions.
(defcustom icomplete-compute-delay .3
"Completions-computation stall, used only with large-number completions.
@@
-144,22
+146,22
@@
minibuffer completion.")
(add-hook 'icomplete-post-command-hook 'icomplete-exhibit)
(defun icomplete-get-keys (func-name)
(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."
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))))
(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.
;;;_ = icomplete-with-completion-tables
(defvar icomplete-with-completion-tables '(internal-complete-buffer)
"Specialized completion tables with which icomplete should operate.
@@
-177,8
+179,11
@@
otherwise turn it off."
(if icomplete-mode
;; The following is not really necessary after first time -
;; no great loss.
(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 ()
;;;_ > icomplete-simple-completing-p ()
(defun icomplete-simple-completing-p ()
@@
-281,7
+286,9
@@
The displays for unambiguous matches have ` [Matched]' appended
matches exist. \(Keybindings for uniquely matched commands
are exhibited within the square braces.)"
matches exist. \(Keybindings for uniquely matched commands
are exhibited within the square braces.)"
- (let* ((comps (completion-all-sorted-completions))
+ (let* ((non-essential t)
+ (md (completion--field-metadata (field-beginning)))
+ (comps (completion-all-sorted-completions))
(last (if (consp comps) (last comps)))
(base-size (cdr last))
(open-bracket (if require-match "(" "["))
(last (if (consp comps) (last comps)))
(base-size (cdr last))
(open-bracket (if require-match "(" "["))
@@
-293,11
+300,11
@@
are exhibited within the square braces.)"
(let* ((most-try
(if (and base-size (> base-size 0))
(completion-try-completion
(let* ((most-try
(if (and base-size (> base-size 0))
(completion-try-completion
- name candidates predicate (length name))
+ name candidates predicate (length name)
md
)
;; If the `comps' are 0-based, the result should be
;; the same with `comps'.
(completion-try-completion
;; If the `comps' are 0-based, the result should be
;; the same with `comps'.
(completion-try-completion
- name comps nil (length name))))
+ name comps nil (length name)
md
)))
(most (if (consp most-try) (car most-try)
(if most-try (car comps) "")))
;; Compare name and most, so we can determine if name is
(most (if (consp most-try) (car most-try)
(if most-try (car comps) "")))
;; Compare name and most, so we can determine if name is
@@
-373,5
+380,4
@@
are exhibited within the square braces.)"
;;allout-layout: (-2 :)
;;End:
;;allout-layout: (-2 :)
;;End:
-;; arch-tag: 339ec25a-0741-4eb6-be63-997532e89b0f
;;; icomplete.el ends here
;;; icomplete.el ends here