Mercurial > emacs

comparison src/minibuf.c @ 83560:738ce3540ffb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-660 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-661 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-662 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-663 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-664 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-665 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-666 Fix read-only prompt problem in isearch * emacs@sv.gnu.org/emacs--devo--0--patch-667 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-668 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-669 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-670 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-671 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-672 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-673 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-206 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-207 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-208 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-600
author Karoly Lorentey <karoly@lorentey.hu>
date Sun, 22 Apr 2007 12:12:29 +0000
parents 07774e5c3ff5 24884385912f
children 5a45becb5728
comparison
equal deleted inserted replaced
83559:edf631bdbb7a 83560:738ce3540ffb
700 { 700 {
701 int count1 = SPECPDL_INDEX (); 701 int count1 = SPECPDL_INDEX ();
702 specbind (Qinhibit_read_only, Qt); 702 specbind (Qinhibit_read_only, Qt);
703 specbind (Qinhibit_modification_hooks, Qt); 703 specbind (Qinhibit_modification_hooks, Qt);
704 Ferase_buffer (); 704 Ferase_buffer ();
705
706 if (!NILP (current_buffer->enable_multibyte_characters)
707 && ! STRING_MULTIBYTE (minibuf_prompt))
708 minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);
709
710 /* Insert the prompt, record where it ends. */
711 Finsert (1, &minibuf_prompt);
712 if (PT > BEG)
713 {
714 Fput_text_property (make_number (BEG), make_number (PT),
715 Qfront_sticky, Qt, Qnil);
716 Fput_text_property (make_number (BEG), make_number (PT),
717 Qrear_nonsticky, Qt, Qnil);
718 Fput_text_property (make_number (BEG), make_number (PT),
719 Qfield, Qt, Qnil);
720 Fadd_text_properties (make_number (BEG), make_number (PT),
721 Vminibuffer_prompt_properties, Qnil);
722 }
705 unbind_to (count1, Qnil); 723 unbind_to (count1, Qnil);
706 } 724 }
707
708 if (!NILP (current_buffer->enable_multibyte_characters)
709 && ! STRING_MULTIBYTE (minibuf_prompt))
710 minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);
711
712 /* Insert the prompt, record where it ends. */
713 Finsert (1, &minibuf_prompt);
714 if (PT > BEG)
715 {
716 Fput_text_property (make_number (BEG), make_number (PT),
717 Qfront_sticky, Qt, Qnil);
718 Fput_text_property (make_number (BEG), make_number (PT),
719 Qrear_nonsticky, Qt, Qnil);
720 Fput_text_property (make_number (BEG), make_number (PT),
721 Qfield, Qt, Qnil);
722 Fadd_text_properties (make_number (BEG), make_number (PT),
723 Vminibuffer_prompt_properties, Qnil);
724 }
725 725
726 minibuf_prompt_width = (int) current_column (); /* iftc */ 726 minibuf_prompt_width = (int) current_column (); /* iftc */
727 727
728 /* Put in the initial input. */ 728 /* Put in the initial input. */
729 if (!NILP (initial)) 729 if (!NILP (initial))
1487 || bestmatchsize != matchsize) 1487 || bestmatchsize != matchsize)
1488 /* Don't count the same string multiple times. */ 1488 /* Don't count the same string multiple times. */
1489 matchcount++; 1489 matchcount++;
1490 bestmatchsize = matchsize; 1490 bestmatchsize = matchsize;
1491 if (matchsize <= SCHARS (string) 1491 if (matchsize <= SCHARS (string)
1492 /* If completion-ignore-case is non-nil, don't
1493 short-circuit because we want to find the best
1494 possible match *including* case differences. */
1495 && !completion_ignore_case
1492 && matchcount > 1) 1496 && matchcount > 1)
1493 /* No need to look any further. */ 1497 /* No need to look any further. */
1494 break; 1498 break;
1495 } 1499 }
1496 } 1500 }