comparison src/fileio.c @ 83171:09bbf2fc80da

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-439 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-440 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-441 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-442 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-443 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-444 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-445 Tweak permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-446 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-211
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 10 Jul 2004 14:37:36 +0000
parents 50b9a96c837c 56b3ebd82889
children 3864ee1088e9
comparison
equal deleted inserted replaced
83170:952f7cc8274d 83171:09bbf2fc80da
205 /* Function to call to read a file name. */ 205 /* Function to call to read a file name. */
206 Lisp_Object Vread_file_name_function; 206 Lisp_Object Vread_file_name_function;
207 207
208 /* Current predicate used by read_file_name_internal. */ 208 /* Current predicate used by read_file_name_internal. */
209 Lisp_Object Vread_file_name_predicate; 209 Lisp_Object Vread_file_name_predicate;
210
211 /* Nonzero means completion ignores case when reading file name. */
212 int read_file_name_completion_ignore_case;
210 213
211 /* Nonzero means, when reading a filename in the minibuffer, 214 /* Nonzero means, when reading a filename in the minibuffer,
212 start out by inserting the default directory into the minibuffer. */ 215 start out by inserting the default directory into the minibuffer. */
213 int insert_default_directory; 216 int insert_default_directory;
214 217
6284 args[6] = predicate; 6287 args[6] = predicate;
6285 RETURN_UNGCPRO (Ffuncall (7, args)); 6288 RETURN_UNGCPRO (Ffuncall (7, args));
6286 } 6289 }
6287 6290
6288 count = SPECPDL_INDEX (); 6291 count = SPECPDL_INDEX ();
6289 #if defined VMS || defined DOS_NT || defined MAC_OSX 6292 specbind (intern ("completion-ignore-case"),
6290 specbind (intern ("completion-ignore-case"), Qt); 6293 read_file_name_completion_ignore_case ? Qt : Qnil);
6291 #endif
6292
6293 specbind (intern ("minibuffer-completing-file-name"), Qt); 6294 specbind (intern ("minibuffer-completing-file-name"), Qt);
6294 specbind (intern ("read-file-name-predicate"), 6295 specbind (intern ("read-file-name-predicate"),
6295 (NILP (predicate) ? Qfile_exists_p : predicate)); 6296 (NILP (predicate) ? Qfile_exists_p : predicate));
6296 6297
6297 GCPRO2 (insdef, default_filename); 6298 GCPRO2 (insdef, default_filename);
6522 Vread_file_name_function = Qnil; 6523 Vread_file_name_function = Qnil;
6523 6524
6524 DEFVAR_LISP ("read-file-name-predicate", &Vread_file_name_predicate, 6525 DEFVAR_LISP ("read-file-name-predicate", &Vread_file_name_predicate,
6525 doc: /* Current predicate used by `read-file-name-internal'. */); 6526 doc: /* Current predicate used by `read-file-name-internal'. */);
6526 Vread_file_name_predicate = Qnil; 6527 Vread_file_name_predicate = Qnil;
6528
6529 DEFVAR_BOOL ("read-file-name-completion-ignore-case", &read_file_name_completion_ignore_case,
6530 doc: /* *Non-nil means when reading a file name completion ignores case. */);
6531 #if defined VMS || defined DOS_NT || defined MAC_OS
6532 read_file_name_completion_ignore_case = 1;
6533 #else
6534 read_file_name_completion_ignore_case = 0;
6535 #endif
6527 6536
6528 DEFVAR_BOOL ("insert-default-directory", &insert_default_directory, 6537 DEFVAR_BOOL ("insert-default-directory", &insert_default_directory,
6529 doc: /* *Non-nil means when reading a filename start with default dir in minibuffer. 6538 doc: /* *Non-nil means when reading a filename start with default dir in minibuffer.
6530 If the initial minibuffer contents are non-empty, you can usually 6539 If the initial minibuffer contents are non-empty, you can usually
6531 request a default filename by typing RETURN without editing. For some 6540 request a default filename by typing RETURN without editing. For some