Mercurial > emacs
changeset 75725:55bd832be66b
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 | 16765a27d0c9 |
| children | 469be04fbaba |
| files | src/minibuf.c |
| diffstat | 1 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/minibuf.c Thu Feb 08 08:53:05 2007 +0000 +++ b/src/minibuf.c Thu Feb 08 08:56:11 2007 +0000 @@ -2012,7 +2012,6 @@ /* 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 @@ 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 @@ /* 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) == '/')