diff options
| author | Kim F. Storm | 2007-02-08 08:56:11 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2007-02-08 08:56:11 +0000 |
| commit | ce5cc6d9a89713a492c51c1e4d415cfa4dfe4897 (patch) | |
| tree | 4c924f99e88957d495a92f5e488beb6211d8739b /src | |
| parent | ac6ee45266efff9e42b3f549e1428d9219661b6c (diff) | |
| download | emacs-ce5cc6d9a89713a492c51c1e4d415cfa4dfe4897.tar.gz emacs-ce5cc6d9a89713a492c51c1e4d415cfa4dfe4897.zip | |
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')
| -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 9a25c3ee278..19835f1d213 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -2012,7 +2012,6 @@ do_completion () | |||
| 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) == '/') |
| @@ -2302,8 +2301,7 @@ Return nil if there is no valid completion, else t. */) | |||
| 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); |
| @@ -2418,7 +2416,6 @@ Return nil if there is no valid completion, else t. */) | |||
| 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) == '/') |