diff options
| author | Miles Bader | 2007-10-19 00:00:21 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-10-19 00:00:21 +0000 |
| commit | 9c8020a8df03dc67a56d7df15664dcf7ace54bf0 (patch) | |
| tree | 09b0646addff3c39f9e96ba89c04bdcc038a87a7 /src/fileio.c | |
| parent | dfc3268dfa133a2e0a677f1af7c1ee548eae065d (diff) | |
| parent | bd3164743080f3eb5fc316aca7cc5322ca58fe33 (diff) | |
| download | emacs-9c8020a8df03dc67a56d7df15664dcf7ace54bf0.tar.gz emacs-9c8020a8df03dc67a56d7df15664dcf7ace54bf0.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 890-898)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 122-128)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 257-258)
- Merge from emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c index c9b6462e4a0..8b6f5ef1a84 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -6079,6 +6079,7 @@ then any auto-save counts as "recent". */) | |||
| 6079 | 6079 | ||
| 6080 | /* Reading and completing file names */ | 6080 | /* Reading and completing file names */ |
| 6081 | extern Lisp_Object Ffile_name_completion (), Ffile_name_all_completions (); | 6081 | extern Lisp_Object Ffile_name_completion (), Ffile_name_all_completions (); |
| 6082 | extern Lisp_Object Qcompletion_ignore_case; | ||
| 6082 | 6083 | ||
| 6083 | /* In the string VAL, change each $ to $$ and return the result. */ | 6084 | /* In the string VAL, change each $ to $$ and return the result. */ |
| 6084 | 6085 | ||
| @@ -6384,7 +6385,7 @@ and `read-file-name-function'. */) | |||
| 6384 | } | 6385 | } |
| 6385 | 6386 | ||
| 6386 | count = SPECPDL_INDEX (); | 6387 | count = SPECPDL_INDEX (); |
| 6387 | specbind (intern ("completion-ignore-case"), | 6388 | specbind (Qcompletion_ignore_case, |
| 6388 | read_file_name_completion_ignore_case ? Qt : Qnil); | 6389 | read_file_name_completion_ignore_case ? Qt : Qnil); |
| 6389 | specbind (intern ("minibuffer-completing-file-name"), Qt); | 6390 | specbind (intern ("minibuffer-completing-file-name"), Qt); |
| 6390 | specbind (intern ("read-file-name-predicate"), | 6391 | specbind (intern ("read-file-name-predicate"), |