Mercurial > emacs
diff src/fileio.c @ 89952:6f6e9fe4658b
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-22
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-431
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-441
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 06 Jul 2004 02:57:15 +0000 |
parents | 4c90ffeb71c5 56b3ebd82889 |
children | 97905c4f1a42 |
line wrap: on
line diff
--- a/src/fileio.c Wed Jun 30 06:14:40 2004 +0000 +++ b/src/fileio.c Tue Jul 06 02:57:15 2004 +0000 @@ -206,6 +206,9 @@ /* Current predicate used by read_file_name_internal. */ Lisp_Object Vread_file_name_predicate; +/* Nonzero means completion ignores case when reading file name. */ +int read_file_name_completion_ignore_case; + /* Nonzero means, when reading a filename in the minibuffer, start out by inserting the default directory into the minibuffer. */ int insert_default_directory; @@ -6197,10 +6200,8 @@ } count = SPECPDL_INDEX (); -#if defined VMS || defined DOS_NT || defined MAC_OSX - specbind (intern ("completion-ignore-case"), Qt); -#endif - + specbind (intern ("completion-ignore-case"), + read_file_name_completion_ignore_case ? Qt : Qnil); specbind (intern ("minibuffer-completing-file-name"), Qt); specbind (intern ("read-file-name-predicate"), (NILP (predicate) ? Qfile_exists_p : predicate)); @@ -6436,6 +6437,14 @@ doc: /* Current predicate used by `read-file-name-internal'. */); Vread_file_name_predicate = Qnil; + DEFVAR_BOOL ("read-file-name-completion-ignore-case", &read_file_name_completion_ignore_case, + doc: /* *Non-nil means when reading a file name completion ignores case. */); +#if defined VMS || defined DOS_NT || defined MAC_OS + read_file_name_completion_ignore_case = 1; +#else + read_file_name_completion_ignore_case = 0; +#endif + DEFVAR_BOOL ("insert-default-directory", &insert_default_directory, doc: /* *Non-nil means when reading a filename start with default dir in minibuffer. If the initial minibuffer contents are non-empty, you can usually