diff options
| author | John Paul Wallington | 2004-07-04 21:08:56 +0000 |
|---|---|---|
| committer | John Paul Wallington | 2004-07-04 21:08:56 +0000 |
| commit | 316ef0dcf13c70ac0cd6250fe35dc5fd51bcfb5b (patch) | |
| tree | dfdc90a2b805ed8d081c7c4dd60206c768d35489 /src | |
| parent | 59db7d6e7f5480f9af8fb7d2c0eab6d699028f36 (diff) | |
| download | emacs-316ef0dcf13c70ac0cd6250fe35dc5fd51bcfb5b.tar.gz emacs-316ef0dcf13c70ac0cd6250fe35dc5fd51bcfb5b.zip | |
(read_file_name_completion_ignore_case): New variable.
(syms_of_fileio): Declare and initialise it.
(Fread_file_name): Bind `completion-ignore-case' to respect it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/fileio.c | 17 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6ba3196d4e7..8d0d1c17609 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2004-07-04 John Paul Wallington <jpw@gnu.org> | ||
| 2 | |||
| 3 | * fileio.c (read_file_name_completion_ignore_case): New variable. | ||
| 4 | (syms_of_fileio): Declare and initialise it. | ||
| 5 | (Fread_file_name): Bind `completion-ignore-case' to respect it. | ||
| 6 | |||
| 1 | 2004-07-03 Eli Zaretskii <eliz@gnu.org> | 7 | 2004-07-03 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * msdos.c (dos_rawgetc): Use make_number to produce Lisp objects | 9 | * msdos.c (dos_rawgetc): Use make_number to produce Lisp objects |
diff --git a/src/fileio.c b/src/fileio.c index 5c073433c75..6e4d5a81004 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -206,6 +206,9 @@ Lisp_Object Vread_file_name_function; | |||
| 206 | /* Current predicate used by read_file_name_internal. */ | 206 | /* Current predicate used by read_file_name_internal. */ |
| 207 | Lisp_Object Vread_file_name_predicate; | 207 | Lisp_Object Vread_file_name_predicate; |
| 208 | 208 | ||
| 209 | /* Nonzero means completion ignores case when reading file name. */ | ||
| 210 | int read_file_name_completion_ignore_case; | ||
| 211 | |||
| 209 | /* Nonzero means, when reading a filename in the minibuffer, | 212 | /* Nonzero means, when reading a filename in the minibuffer, |
| 210 | start out by inserting the default directory into the minibuffer. */ | 213 | start out by inserting the default directory into the minibuffer. */ |
| 211 | int insert_default_directory; | 214 | int insert_default_directory; |
| @@ -6284,10 +6287,8 @@ provides a file dialog box. */) | |||
| 6284 | } | 6287 | } |
| 6285 | 6288 | ||
| 6286 | count = SPECPDL_INDEX (); | 6289 | count = SPECPDL_INDEX (); |
| 6287 | #if defined VMS || defined DOS_NT || defined MAC_OSX | 6290 | specbind (intern ("completion-ignore-case"), |
| 6288 | specbind (intern ("completion-ignore-case"), Qt); | 6291 | read_file_name_completion_ignore_case ? Qt : Qnil); |
| 6289 | #endif | ||
| 6290 | |||
| 6291 | specbind (intern ("minibuffer-completing-file-name"), Qt); | 6292 | specbind (intern ("minibuffer-completing-file-name"), Qt); |
| 6292 | specbind (intern ("read-file-name-predicate"), | 6293 | specbind (intern ("read-file-name-predicate"), |
| 6293 | (NILP (predicate) ? Qfile_exists_p : predicate)); | 6294 | (NILP (predicate) ? Qfile_exists_p : predicate)); |
| @@ -6523,6 +6524,14 @@ same format as a regular save would use. */); | |||
| 6523 | doc: /* Current predicate used by `read-file-name-internal'. */); | 6524 | doc: /* Current predicate used by `read-file-name-internal'. */); |
| 6524 | Vread_file_name_predicate = Qnil; | 6525 | Vread_file_name_predicate = Qnil; |
| 6525 | 6526 | ||
| 6527 | DEFVAR_BOOL ("read-file-name-completion-ignore-case", &read_file_name_completion_ignore_case, | ||
| 6528 | doc: /* *Non-nil means when reading a file name completion ignores case. */); | ||
| 6529 | #if defined VMS || defined DOS_NT || defined MAC_OS | ||
| 6530 | read_file_name_completion_ignore_case = 1; | ||
| 6531 | #else | ||
| 6532 | read_file_name_completion_ignore_case = 0; | ||
| 6533 | #endif | ||
| 6534 | |||
| 6526 | DEFVAR_BOOL ("insert-default-directory", &insert_default_directory, | 6535 | DEFVAR_BOOL ("insert-default-directory", &insert_default_directory, |
| 6527 | doc: /* *Non-nil means when reading a filename start with default dir in minibuffer. | 6536 | doc: /* *Non-nil means when reading a filename start with default dir in minibuffer. |
| 6528 | If the initial minibuffer contents are non-empty, you can usually | 6537 | If the initial minibuffer contents are non-empty, you can usually |