diff options
| author | Karoly Lorentey <[email protected]> | 2007-04-22 12:12:29 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2007-04-22 12:12:29 +0000 |
| commit | e18c709364b095ea0be8ecabe458ac9a642a252f (patch) | |
| tree | efe814a842f932f387b3947c572bf43a548d17ef /src/minibuf.c | |
| parent | 81088e260b086fe28f36964f32b6338210ec6fd8 (diff) | |
| parent | 9f25e707aaad5ed14a9448e9c5d345ff0bdbc5a7 (diff) | |
Merged from [email protected]
Patches applied:
* [email protected]/emacs--devo--0--patch-660
Update from CVS
* [email protected]/emacs--devo--0--patch-661
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-662
Update from CVS
* [email protected]/emacs--devo--0--patch-663
Update from CVS
* [email protected]/emacs--devo--0--patch-664
Update from CVS
* [email protected]/emacs--devo--0--patch-665
Update from CVS
* [email protected]/emacs--devo--0--patch-666
Fix read-only prompt problem in isearch
* [email protected]/emacs--devo--0--patch-667
Update from CVS
* [email protected]/emacs--devo--0--patch-668
Update from CVS
* [email protected]/emacs--devo--0--patch-669
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-670
Update from CVS
* [email protected]/emacs--devo--0--patch-671
Update from CVS
* [email protected]/emacs--devo--0--patch-672
Update from CVS
* [email protected]/emacs--devo--0--patch-673
Update from CVS
* [email protected]/gnus--rel--5.10--patch-206
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-207
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-208
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-600
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 51a64ffed8..e3fb864161 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -702,27 +702,27 @@ read_minibuf (map, initial, prompt, backup_n, expflag, specbind (Qinhibit_read_only, Qt); specbind (Qinhibit_modification_hooks, Qt); Ferase_buffer (); + + if (!NILP (current_buffer->enable_multibyte_characters) + && ! STRING_MULTIBYTE (minibuf_prompt)) + minibuf_prompt = Fstring_make_multibyte (minibuf_prompt); + + /* Insert the prompt, record where it ends. */ + Finsert (1, &minibuf_prompt); + if (PT > BEG) + { + Fput_text_property (make_number (BEG), make_number (PT), + Qfront_sticky, Qt, Qnil); + Fput_text_property (make_number (BEG), make_number (PT), + Qrear_nonsticky, Qt, Qnil); + Fput_text_property (make_number (BEG), make_number (PT), + Qfield, Qt, Qnil); + Fadd_text_properties (make_number (BEG), make_number (PT), + Vminibuffer_prompt_properties, Qnil); + } unbind_to (count1, Qnil); } - if (!NILP (current_buffer->enable_multibyte_characters) - && ! STRING_MULTIBYTE (minibuf_prompt)) - minibuf_prompt = Fstring_make_multibyte (minibuf_prompt); - - /* Insert the prompt, record where it ends. */ - Finsert (1, &minibuf_prompt); - if (PT > BEG) - { - Fput_text_property (make_number (BEG), make_number (PT), - Qfront_sticky, Qt, Qnil); - Fput_text_property (make_number (BEG), make_number (PT), - Qrear_nonsticky, Qt, Qnil); - Fput_text_property (make_number (BEG), make_number (PT), - Qfield, Qt, Qnil); - Fadd_text_properties (make_number (BEG), make_number (PT), - Vminibuffer_prompt_properties, Qnil); - } - minibuf_prompt_width = (int) current_column (); /* iftc */ /* Put in the initial input. */ @@ -1489,6 +1489,10 @@ is used to further constrain the set of candidates. */) matchcount++; bestmatchsize = matchsize; if (matchsize <= SCHARS (string) + /* If completion-ignore-case is non-nil, don't + short-circuit because we want to find the best + possible match *including* case differences. */ + && !completion_ignore_case && matchcount > 1) /* No need to look any further. */ break; |