HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus@detlef.
[bpt/emacs.git]
/
lisp
/
minibuffer.el
diff --git
a/lisp/minibuffer.el
b/lisp/minibuffer.el
index
e012c32
..
4bf06a4
100644
(file)
--- a/
lisp/minibuffer.el
+++ b/
lisp/minibuffer.el
@@
-657,7
+657,8
@@
E = after completion we now have an Exact match.
(minibuffer-hide-completions))
;; Show the completion table, if requested.
((not exact)
(minibuffer-hide-completions))
;; Show the completion table, if requested.
((not exact)
- (if (cond ((null completion-show-inline-help) t)
+ (if (cond (icomplete-mode t)
+ ((null completion-show-inline-help) t)
((eq completion-auto-help 'lazy)
(eq this-command last-command))
(t completion-auto-help))
((eq completion-auto-help 'lazy)
(eq this-command last-command))
(t completion-auto-help))