procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix last change -- undo the following part of that change:

Browse source 
(do_completion, Fminibuffer_complete_word):
If Vminibuffer_completing_file_name equals Qlambda, treat it as Qnil.
This commit is contained in:
Kim F. Storm 2007-02-08 08:56:11 +00:00
parent ac6ee45266
commit ce5cc6d9a8
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/minibuf.c
View file

@ -2012,7 +2012,6 @@ do_completion ()
/* Some completion happened */
if (! NILP (Vminibuffer_completing_file_name)
&& ! EQ (Vminibuffer_completing_file_name, Qlambda)
&& SREF (completion, SBYTES (completion) - 1) == '/'
&& PT < ZV
&& FETCH_CHAR (PT_BYTE) == '/')
@ -2302,8 +2301,7 @@ Return nil if there is no valid completion, else t. */)
GCPRO2 (completion, tem);
/* If reading a file name,
expand any $ENVVAR refs in the buffer and in TEM. */
if (! NILP (Vminibuffer_completing_file_name)
&& ! EQ (Vminibuffer_completing_file_name, Qlambda))
if (! NILP (Vminibuffer_completing_file_name))
{
Lisp_Object substituted;
substituted = Fsubstitute_in_file_name (tem);
@ -2418,7 +2416,6 @@ Return nil if there is no valid completion, else t. */)
/* Otherwise insert in minibuffer the chars we got */
if (! NILP (Vminibuffer_completing_file_name)
&& ! EQ (Vminibuffer_completing_file_name, Qlambda)
&& SREF (completion, SBYTES (completion) - 1) == '/'
&& PT < ZV
&& FETCH_CHAR (PT_BYTE) == '/')