Merged in changes from CVS trunk.

Patches applied:

 * [email protected]/emacs--cvs-trunk--0--patch-439
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-440
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-441
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-442
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-443
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-444
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-445
   Tweak permissions

 * [email protected]/emacs--cvs-trunk--0--patch-446
   Update from CVS


git-archimport-id: [email protected]/emacs--multi-tty--0--patch-211

1 files changed, 13 insertions, 4 deletions

diff --git a/src/fileio.c b/src/fileio.c
index 6a95572ca3..2a4d5fb230 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -208,6 +208,9 @@ Lisp_Object Vread_file_name_function;
 /* 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;
@@ -6286,10 +6289,8 @@ provides a file dialog box.  */)
     }
 
   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));
@@ -6525,6 +6526,14 @@ same format as a regular save would use.  */);
 	       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