Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
89951:aafd98bcc2ac | 89952:6f6e9fe4658b |
---|---|
203 /* Function to call to read a file name. */ | 203 /* Function to call to read a file name. */ |
204 Lisp_Object Vread_file_name_function; | 204 Lisp_Object Vread_file_name_function; |
205 | 205 |
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 | |
209 /* Nonzero means completion ignores case when reading file name. */ | |
210 int read_file_name_completion_ignore_case; | |
208 | 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; |
212 | 215 |
6195 args[6] = predicate; | 6198 args[6] = predicate; |
6196 RETURN_UNGCPRO (Ffuncall (7, args)); | 6199 RETURN_UNGCPRO (Ffuncall (7, args)); |
6197 } | 6200 } |
6198 | 6201 |
6199 count = SPECPDL_INDEX (); | 6202 count = SPECPDL_INDEX (); |
6200 #if defined VMS || defined DOS_NT || defined MAC_OSX | 6203 specbind (intern ("completion-ignore-case"), |
6201 specbind (intern ("completion-ignore-case"), Qt); | 6204 read_file_name_completion_ignore_case ? Qt : Qnil); |
6202 #endif | |
6203 | |
6204 specbind (intern ("minibuffer-completing-file-name"), Qt); | 6205 specbind (intern ("minibuffer-completing-file-name"), Qt); |
6205 specbind (intern ("read-file-name-predicate"), | 6206 specbind (intern ("read-file-name-predicate"), |
6206 (NILP (predicate) ? Qfile_exists_p : predicate)); | 6207 (NILP (predicate) ? Qfile_exists_p : predicate)); |
6207 | 6208 |
6208 GCPRO2 (insdef, default_filename); | 6209 GCPRO2 (insdef, default_filename); |
6433 Vread_file_name_function = Qnil; | 6434 Vread_file_name_function = Qnil; |
6434 | 6435 |
6435 DEFVAR_LISP ("read-file-name-predicate", &Vread_file_name_predicate, | 6436 DEFVAR_LISP ("read-file-name-predicate", &Vread_file_name_predicate, |
6436 doc: /* Current predicate used by `read-file-name-internal'. */); | 6437 doc: /* Current predicate used by `read-file-name-internal'. */); |
6437 Vread_file_name_predicate = Qnil; | 6438 Vread_file_name_predicate = Qnil; |
6439 | |
6440 DEFVAR_BOOL ("read-file-name-completion-ignore-case", &read_file_name_completion_ignore_case, | |
6441 doc: /* *Non-nil means when reading a file name completion ignores case. */); | |
6442 #if defined VMS || defined DOS_NT || defined MAC_OS | |
6443 read_file_name_completion_ignore_case = 1; | |
6444 #else | |
6445 read_file_name_completion_ignore_case = 0; | |
6446 #endif | |
6438 | 6447 |
6439 DEFVAR_BOOL ("insert-default-directory", &insert_default_directory, | 6448 DEFVAR_BOOL ("insert-default-directory", &insert_default_directory, |
6440 doc: /* *Non-nil means when reading a filename start with default dir in minibuffer. | 6449 doc: /* *Non-nil means when reading a filename start with default dir in minibuffer. |
6441 If the initial minibuffer contents are non-empty, you can usually | 6450 If the initial minibuffer contents are non-empty, you can usually |
6442 request a default filename by typing RETURN without editing. For some | 6451 request a default filename by typing RETURN without editing. For some |