* 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.

4 files changed, 15 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 454aa92093f..178e5b38969 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+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
diff --git a/src/commands.h b/src/commands.h
index c882757f0c1..ad0615b9717 100644
--- a/src/commands.h
+++ b/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;
diff --git a/src/keymap.c b/src/keymap.c
index e11c7b97637..7a9b5949151 100644
--- a/src/keymap.c
+++ b/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,
diff --git a/src/minibuf.c b/src/minibuf.c
index 1c1bf0356e1..7c22b6b5b99 100644
--- a/src/minibuf.c
+++ b/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));