(Fdocumentation, Fdocumentation_property, Fsubstitute_command_keys):

[gnu-emacs] / src / minibuf.c

diff --git a/src/minibuf.c b/src/minibuf.c
index 8543a7c481398913741749fbecfb0ca6d50daaa7..c2a11a1d62a35cec7d955d5142d6f82b84465088 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -112,7 +112,7 @@ choose_minibuf_frame ()
   if (selected_frame != 0
       && !EQ (minibuf_window, selected_frame->minibuffer_window))
     {
-#ifdef MSDOS
+#if defined(MSDOS) && !defined(HAVE_X_WINDOWS)
       selected_frame->minibuffer_window = minibuf_window;
 #else
       /* I don't think that any frames may validly have a null minibuffer
@@ -298,8 +298,10 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos)
     }
 
   /* Make minibuffer contents into a string */
-  val = make_buffer_string (1, Z);
+  val = make_buffer_string (1, Z, 1);
+#if 0  /* make_buffer_string should handle the gap.  */
   bcopy (GAP_END_ADDR, XSTRING (val)->data + GPT - BEG, Z - GPT);
+#endif
 
   /* VAL is the string of minibuffer text.  */
   last_minibuf_string = val;