* keymap.c (Vminibuffer_local_filename_must_match_map):

Rename from Vminibuffer_local_must_match_filename_map.
(syms_of_keymap):
* minibuf.c (Fcompleting_read): Adjust accordingly.
* commands.h: Rename declaration as well.
* minibuffer.el (minibuffer-local-must-match-filename-map):
Declare obsolete alias for the old name.

etc/NEWS

@@ -811,6 +811,9 @@ functions and variables (formerly used for Tamil script).
 
 * Lisp Changes in Emacs 23.1
 
+** minibuffer-local-must-match-filename-map is now named
+minibuffer-local-filename-must-match-map.
+
 ** `all-completions' may now return the base size in the last cdr.
 Since this means the returned list is not properly nil-terminated, this
 is an incompatible change and is thus enabled by the new variable

lisp/ChangeLog

 2008-06-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* minibuffer.el (minibuffer-local-must-match-filename-map):
+	Declare obsolete alias for the old name.
+
 	* abbrev.el (unexpand-abbrev): Better preserve markers.
 
 2008-06-05  Glenn Morris  <rgm@gnu.org>

lisp/minibuffer.el

@@ -906,6 +906,9 @@ specified by COMMON-SUBSTRING."
 
 ;;; Key bindings.
 
+(define-obsolete-variable-alias 'minibuffer-local-must-match-filename-map
+  'minibuffer-local-filename-must-match-map "23.1")
+
 (let ((map minibuffer-local-map))
   (define-key map "\C-g" 'abort-recursive-edit)
   (define-key map "\r" 'exit-minibuffer)
@@ -925,7 +928,7 @@ specified by COMMON-SUBSTRING."
 
 (let ((map minibuffer-local-filename-completion-map))
   (define-key map " " nil))
-(let ((map minibuffer-local-must-match-filename-map))
+(let ((map minibuffer-local-filename-must-match-map))
   (define-key map " " nil))
 
 (let ((map minibuffer-local-ns-map))

src/ChangeLog

+2008-06-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* keymap.c (Vminibuffer_local_filename_must_match_map):
+	Rename from Vminibuffer_local_must_match_filename_map.
+	(syms_of_keymap):
+	* minibuf.c (Fcompleting_read): Adjust accordingly.
+	* commands.h: Rename declaration as well.
+
 2008-06-05  Kenichi Handa  <handa@m17n.org>
 
 	* xfont.c (xfont_list): Don't set registry to iso8859-1 even if it

src/commands.h

@@ -43,7 +43,7 @@ extern Lisp_Object Vminibuffer_local_must_match_map;
 
 /* keymap used for minibuffers when doing completion in filenames
    and require a match */
-extern Lisp_Object Vminibuffer_local_must_match_filename_map;
+extern Lisp_Object Vminibuffer_local_filename_must_match_map;
 
 /* Last character of last key sequence.  */
 extern Lisp_Object last_command_char;

src/keymap.c

@@ -74,7 +74,7 @@ Lisp_Object Vminibuffer_local_filename_completion_map;
 
 /* keymap used for minibuffers when doing completion in filenames
    with require-match*/
-Lisp_Object Vminibuffer_local_must_match_filename_map;
+Lisp_Object Vminibuffer_local_filename_must_match_map;
 
 /* keymap used for minibuffers when doing completion and require a match */
 /* was MinibufLocalMustMatchMap */
@@ -3936,11 +3936,11 @@ don't alter it yourself.  */);
   Fset_keymap_parent (Vminibuffer_local_must_match_map,
 		      Vminibuffer_local_completion_map);
 
-  DEFVAR_LISP ("minibuffer-local-must-match-filename-map",
-	       &Vminibuffer_local_must_match_filename_map,
+  DEFVAR_LISP ("minibuffer-local-filename-must-match-map",
+	       &Vminibuffer_local_filename_must_match_map,
 	       doc: /* Local keymap for minibuffer input with completion for filenames with exact match.  */);
-  Vminibuffer_local_must_match_filename_map = Fmake_sparse_keymap (Qnil);
-  Fset_keymap_parent (Vminibuffer_local_must_match_filename_map,
+  Vminibuffer_local_filename_must_match_map = Fmake_sparse_keymap (Qnil);
+  Fset_keymap_parent (Vminibuffer_local_filename_must_match_map,
 		      Vminibuffer_local_must_match_map);
 
   DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist,

src/minibuf.c

@@ -1815,7 +1815,7 @@ Completion ignores case if the ambient value of
 		      : (NILP (Vminibuffer_completing_file_name)
 			 || EQ (Vminibuffer_completing_file_name, Qlambda)
 			 ? Vminibuffer_local_must_match_map
-			 : Vminibuffer_local_must_match_filename_map),
+			 : Vminibuffer_local_filename_must_match_map),
 		      init, prompt, make_number (pos), 0,
 		      histvar, histpos, def, 0,
 		      !NILP (inherit_input_method));