XEmacs 21.2.20 "Yoko".

[chise/xemacs-chise.git.1] / src / minibuf.c

diff --git a/src/minibuf.c b/src/minibuf.c
index 6e6c5bc..16174c5 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -289,14 +289,14 @@ ignore_completion_p (Lisp_Object completion_string,
 }
 
 
-/* #### Maybe we should allow ALIST to be a hashtable.  It is wrong
+/* #### Maybe we should allow ALIST to be a hash table.  It is wrong
    for the use of obarrays to be better-rewarded than the use of
-   hashtables.  By better-rewarded I mean that you can pass an obarray
+   hash tables.  By better-rewarded I mean that you can pass an obarray
    to all of the completion functions, whereas you can't do anything
-   like that with a hashtable.
+   like that with a hash table.
 
    To do so, there should probably be a
-   map_obarray_or_alist_or_hashtable function which would be used by
+   map_obarray_or_alist_or_hash_table function which would be used by
    both Ftry_completion and Fall_completions.  But would the
    additional funcalls slow things down?  */
 
@@ -936,9 +936,15 @@ syms_of_minibuf (void)
 }
 
 void
-vars_of_minibuf (void)
+reinit_vars_of_minibuf (void)
 {
   minibuf_level = 0;
+}
+
+void
+vars_of_minibuf (void)
+{
+  reinit_vars_of_minibuf ();
 
   staticpro (&Vminibuf_prompt);
   Vminibuf_prompt = Qnil;
@@ -965,7 +971,7 @@ Each completion has to match all regexps in this list.
 }
 
 void
-complex_vars_of_minibuf (void)
+reinit_complex_vars_of_minibuf (void)
 {
   /* This function can GC */
 #ifdef I18N3
@@ -974,8 +980,14 @@ complex_vars_of_minibuf (void)
 #endif
   Vminibuffer_zero
     = Fget_buffer_create
-      (Fpurecopy (build_string (DEFER_GETTEXT (" *Minibuf-0*"))));
+      (build_string (DEFER_GETTEXT (" *Minibuf-0*")));
   Vecho_area_buffer
     = Fget_buffer_create
-      (Fpurecopy (build_string (DEFER_GETTEXT (" *Echo Area*"))));
+      (build_string (DEFER_GETTEXT (" *Echo Area*")));
+}
+
+void
+complex_vars_of_minibuf (void)
+{
+  reinit_complex_vars_of_minibuf ();
 }