diff options
| author | Kim F. Storm <[email protected]> | 2007-02-08 08:56:11 +0000 |
|---|---|---|
| committer | Kim F. Storm <[email protected]> | 2007-02-08 08:56:11 +0000 |
| commit | ce5cc6d9a89713a492c51c1e4d415cfa4dfe4897 (patch) | |
| tree | 4c924f99e88957d495a92f5e488beb6211d8739b /src/minibuf.c | |
| parent | ac6ee45266efff9e42b3f549e1428d9219661b6c (diff) | |
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.
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 9a25c3ee27..19835f1d21 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -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) == '/') |