comparison src/minibuf.c @ 83380:94f174e5569d

Merged from miles@gnu.org--gnu-2005 (patch 543) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-543 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-420
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 17 Sep 2005 19:00:49 +0000
parents 0b75ace4f7ad da27b91068ae
children 2a679c81f552
comparison
equal deleted inserted replaced
83379:23f939241b7d 83380:94f174e5569d
2162 Return nil if there is no valid completion, else t. */) 2162 Return nil if there is no valid completion, else t. */)
2163 () 2163 ()
2164 { 2164 {
2165 Lisp_Object completion, tem, tem1; 2165 Lisp_Object completion, tem, tem1;
2166 register int i, i_byte; 2166 register int i, i_byte;
2167 register const unsigned char *completion_string;
2168 struct gcpro gcpro1, gcpro2; 2167 struct gcpro gcpro1, gcpro2;
2169 int prompt_end_charpos = XINT (Fminibuffer_prompt_end ()); 2168 int prompt_end_charpos = XINT (Fminibuffer_prompt_end ());
2170 2169
2171 /* We keep calling Fbuffer_string rather than arrange for GC to 2170 /* We keep calling Fbuffer_string rather than arrange for GC to
2172 hold onto a pointer to one of the strings thus made. */ 2171 hold onto a pointer to one of the strings thus made. */
2293 /* Now find first word-break in the stuff found by completion. 2292 /* Now find first word-break in the stuff found by completion.
2294 i gets index in string of where to stop completing. */ 2293 i gets index in string of where to stop completing. */
2295 { 2294 {
2296 int len, c; 2295 int len, c;
2297 int bytes = SBYTES (completion); 2296 int bytes = SBYTES (completion);
2298 completion_string = SDATA (completion); 2297 register const unsigned char *completion_string = SDATA (completion);
2299 for (; i_byte < SBYTES (completion); i_byte += len, i++) 2298 for (; i_byte < SBYTES (completion); i_byte += len, i++)
2300 { 2299 {
2301 c = STRING_CHAR_AND_LENGTH (completion_string + i_byte, 2300 c = STRING_CHAR_AND_LENGTH (completion_string + i_byte,
2302 bytes - i_byte, 2301 bytes - i_byte,
2303 len); 2302 len);