Mercurial > emacs

comparison src/minibuf.c @ 75725:55bd832be66b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix last change -- undo the following part of that change: (do_completion, Fminibuffer_complete_word): If Vminibuffer_completing_file_name equals Qlambda, treat it as Qnil.
author Kim F. Storm <storm@cua.dk>
date Thu, 08 Feb 2007 08:56:11 +0000
parents d93f8cf55f80
children c0a1f896395c 52a7f3f50b89
comparison
equal deleted inserted replaced
75724:16765a27d0c9 75725:55bd832be66b
2010 { 2010 {
2011 int prompt_end = XINT (Fminibuffer_prompt_end ()); 2011 int prompt_end = XINT (Fminibuffer_prompt_end ());
2012 /* Some completion happened */ 2012 /* Some completion happened */
2013 2013
2014 if (! NILP (Vminibuffer_completing_file_name) 2014 if (! NILP (Vminibuffer_completing_file_name)
2015 && ! EQ (Vminibuffer_completing_file_name, Qlambda)
2016 && SREF (completion, SBYTES (completion) - 1) == '/' 2015 && SREF (completion, SBYTES (completion) - 1) == '/'
2017 && PT < ZV 2016 && PT < ZV
2018 && FETCH_CHAR (PT_BYTE) == '/') 2017 && FETCH_CHAR (PT_BYTE) == '/')
2019 { 2018 {
2020 del_range (prompt_end, PT + 1); 2019 del_range (prompt_end, PT + 1);
2300 CHECK_STRING (completion); 2299 CHECK_STRING (completion);
2301 tem = Fminibuffer_completion_contents (); 2300 tem = Fminibuffer_completion_contents ();
2302 GCPRO2 (completion, tem); 2301 GCPRO2 (completion, tem);
2303 /* If reading a file name, 2302 /* If reading a file name,
2304 expand any $ENVVAR refs in the buffer and in TEM. */ 2303 expand any $ENVVAR refs in the buffer and in TEM. */
2305 if (! NILP (Vminibuffer_completing_file_name) 2304 if (! NILP (Vminibuffer_completing_file_name))
2306 && ! EQ (Vminibuffer_completing_file_name, Qlambda))
2307 { 2305 {
2308 Lisp_Object substituted; 2306 Lisp_Object substituted;
2309 substituted = Fsubstitute_in_file_name (tem); 2307 substituted = Fsubstitute_in_file_name (tem);
2310 if (! EQ (substituted, tem)) 2308 if (! EQ (substituted, tem))
2311 { 2309 {
2416 } 2414 }
2417 2415
2418 /* Otherwise insert in minibuffer the chars we got */ 2416 /* Otherwise insert in minibuffer the chars we got */
2419 2417
2420 if (! NILP (Vminibuffer_completing_file_name) 2418 if (! NILP (Vminibuffer_completing_file_name)
2421 && ! EQ (Vminibuffer_completing_file_name, Qlambda)
2422 && SREF (completion, SBYTES (completion) - 1) == '/' 2419 && SREF (completion, SBYTES (completion) - 1) == '/'
2423 && PT < ZV 2420 && PT < ZV
2424 && FETCH_CHAR (PT_BYTE) == '/') 2421 && FETCH_CHAR (PT_BYTE) == '/')
2425 { 2422 {
2426 del_range (prompt_end_charpos, PT + 1); 2423 del_range (prompt_end_charpos, PT + 1);