summaryrefslogtreecommitdiff
path: root/lisp/ido.el
diff options
context:
space:
mode:
authorLeo Liu <sdl.web@gmail.com>2011-03-20 18:35:27 +0800
committerLeo Liu <sdl.web@gmail.com>2011-03-20 18:35:27 +0800
commit3ec03f7e4696b4af1af7e1a2fef2a64ccb9224c2 (patch)
tree7db63336e461f8cfbd27a5fcbfcfac5e12688739 /lisp/ido.el
parent7d476bdec543cfba684a4d63b8a6bbeb775c75c3 (diff)
downloademacs-3ec03f7e4696b4af1af7e1a2fef2a64ccb9224c2.tar.gz
New variable completing-read-function to customize completing-read
Diffstat (limited to 'lisp/ido.el')
-rw-r--r--lisp/ido.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ido.el b/lisp/ido.el
index 2e67e367a8f..2a5c7cf2f0e 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1983,7 +1983,7 @@ If INITIAL is non-nil, it specifies the initial input string."
(setq ido-exit nil)
(setq ido-final-text
(catch 'ido
- (completing-read
+ (completing-read-default
(ido-make-prompt item prompt)
'(("dummy" . 1)) nil nil ; table predicate require-match
(prog1 ido-text-init (setq ido-text-init nil)) ;initial-contents
@@ -4740,13 +4740,13 @@ See `read-directory-name' for additional parameters."
(concat ido-current-directory filename)))))
;;;###autoload
-(defun ido-completing-read (prompt choices &optional predicate require-match initial-input hist def)
+(defun ido-completing-read (prompt choices &optional predicate require-match initial-input hist def inherit-input-method)
"Ido replacement for the built-in `completing-read'.
Read a string in the minibuffer with ido-style completion.
PROMPT is a string to prompt with; normally it ends in a colon and a space.
CHOICES is a list of strings which are the possible completions.
-PREDICATE is currently ignored; it is included to be compatible
- with `completing-read'.
+PREDICATE and INHERIT-INPUT-METHOD is currently ignored; it is included
+ to be compatible with `completing-read'.
If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless
the input is (or completes to) an element of CHOICES or is null.
If the input is null, `ido-completing-read' returns DEF, or an empty