* minibuf.c (keys_of_minibuf): Delete.

* lisp.h (keys_of_minibuf): Delete.
* emacs.c (main): Don't call keys_of_minibuf.

4 files changed, 20 insertions, 53 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a0130c71cb..e5befabeda7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,38 +1,43 @@
+2008-05-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuf.c (keys_of_minibuf): Delete.
+        * lisp.h (keys_of_minibuf): Delete.
+        * emacs.c (main): Don't call keys_of_minibuf.
+
 2008-05-22  Kenichi Handa  <handa@m17n.org>
 
-        * ftfont.c (ftfont_resolve_generic_family): Renamed from
+        * ftfont.c (ftfont_resolve_generic_family): Rename from
         ftfont_list_generic_family.  Return a single family for each
         generic family.
         (ftfont_spec_pattern): Add FC_FAMILY to pattern.
-        (ftfont_list): Adjusted for the change of
+        (ftfont_list): Adjust for the change of
         ftfont_resolve_generic_family.  Call font_add_log.
         (ftfont_match): Call font_add_log.
 
         * font.h (Ffont_xlfd_name): EXFUN adjusted.
         (FONT_DEBUG): Define it.
         (font_add_log): Extern it.
-        (font_assert): Renamed from xassert.
+        (font_assert): Rename from xassert.
 
         * xfont.c (xfont_get_pcm): Change xassert to font_assert.
         (xfont_list_family): Call font_add_log.
         (xfont_match): Likewise.
-        (memq_no_quit): Deleted.
+        (memq_no_quit): Delete.
 
         * fontset.c (fontset_from_font, Ffontset_info): Add the 2nd arg in
         call of Ffont_xlfd_name.
 
         * xfaces.c (struct table_entry, slant_table, weight_table)
-        (swidth_table): Moved to font.c.
+        (swidth_table): Move to font.c.
 
         * font.c: Checking of FONT_DEBUG is moved to font.h.  All calls of
-        xassert are changed to font_assert.  Many unused variables
-        deleted.
-        (Vfont_weight_table, Vfont_slant_table, Vfont_width_table): New
-        variables.
-        (struct table_entry): Moved from xfaces.c and modified.
-        (weight_table, slant_table, width_table): Moved from xfaces.c and
+        xassert are changed to font_assert.  Delete many unused variables.
+        (Vfont_weight_table, Vfont_slant_table, Vfont_width_table):
+        New variables.
+        (struct table_entry): Move from xfaces.c and modified.
+        (weight_table, slant_table, width_table): Move from xfaces.c and
         contents adjusted for the change of struct table_entry.
-        (font_style_to_value, font_style_symbolic): Adjuted for the format
+        (font_style_to_value, font_style_symbolic): Adjut for the format
         change of font_style_table.
         (font_parse_family_registry): Don't overwrite existing foundry and
         family of font_spec.
@@ -40,10 +45,10 @@
         (font_sort_entites): Call font_add_log.
         (font_delete_unmatched): Return a newly created list.
         (font_list_entities): Fix previous change.  Call font_add_log.
-        (font_matching_entity, font_open_entity, font_close_entity): Call
-        font_add_log.
+        (font_matching_entity, font_open_entity, font_close_entity):
+        Call font_add_log.
         (Ffont_xlfd_name): New arg FOLD-WILDCARDS.
-        (Finternal_set_font_style_table): Deleted.
+        (Finternal_set_font_style_table): Delete.
         (BUILD_STYLE_TABLE): New macro.
         (build_style_table): New function.
         (Vfont_log, font_log_env_checked): New variables.
diff --git a/src/emacs.c b/src/emacs.c
index 94e1448c2f0..7873a7eaae4 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1647,7 +1647,6 @@ main (argc, argv
       keys_of_buffer ();
       keys_of_keyboard ();
       keys_of_keymap ();
-      keys_of_minibuf ();
       keys_of_window ();
     }
   else
diff --git a/src/lisp.h b/src/lisp.h
index 5fcbd23df88..288d9642b87 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2978,7 +2978,6 @@ extern Lisp_Object get_minibuffer P_ ((int));
 extern void temp_echo_area_glyphs P_ ((Lisp_Object));
 extern void init_minibuf_once P_ ((void));
 extern void syms_of_minibuf P_ ((void));
-extern void keys_of_minibuf P_ ((void));
 
 /* Defined in callint.c */
 
diff --git a/src/minibuf.c b/src/minibuf.c
index f6bd9dd8ead..1c1bf0356e1 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2262,41 +2262,5 @@ properties.  */);
   defsubr (&Scompleting_read);
 }
 
-void
-keys_of_minibuf ()
-{
-  initial_define_key (Vminibuffer_local_map, Ctl ('g'),
-                      "abort-recursive-edit");
-  initial_define_key (Vminibuffer_local_map, Ctl ('m'),
-                      "exit-minibuffer");
-  initial_define_key (Vminibuffer_local_map, Ctl ('j'),
-                      "exit-minibuffer");
-
-  initial_define_key (Vminibuffer_local_ns_map, ' ',
-                      "exit-minibuffer");
-  initial_define_key (Vminibuffer_local_ns_map, '\t',
-                      "exit-minibuffer");
-  initial_define_key (Vminibuffer_local_ns_map, '?',
-                      "self-insert-and-exit");
-
-  initial_define_key (Vminibuffer_local_completion_map, '\t',
-                      "minibuffer-complete");
-  initial_define_key (Vminibuffer_local_completion_map, ' ',
-                      "minibuffer-complete-word");
-  initial_define_key (Vminibuffer_local_completion_map, '?',
-                      "minibuffer-completion-help");
-
-  Fdefine_key (Vminibuffer_local_filename_completion_map,
-               build_string (" "), Qnil);
-
-  initial_define_key (Vminibuffer_local_must_match_map, Ctl ('m'),
-                      "minibuffer-complete-and-exit");
-  initial_define_key (Vminibuffer_local_must_match_map, Ctl ('j'),
-                      "minibuffer-complete-and-exit");
-
-  Fdefine_key (Vminibuffer_local_must_match_filename_map,
-               build_string (" "), Qnil);
-}
-
 /* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73
    (do not change this comment) */