Mercurial > emacs

changeset 3690:2d6cd35210f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(read_minibuf): Set and use mini_frame only if MULTI_FRAME.
author Richard M. Stallman <rms@gnu.org>
date Sat, 12 Jun 1993 17:16:00 +0000
parents 82856e3ea14d
children 49ce2242f5c1
files src/minibuf.c
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/minibuf.c	Sat Jun 12 17:10:13 1993 +0000
+++ b/src/minibuf.c	Sat Jun 12 17:16:00 1993 +0000
@@ -106,14 +106,14 @@
      Lisp_Object map;
      Lisp_Object initial;
      Lisp_Object prompt;
-     int backup_n;
+     Lisp_Object backup_n;
      int expflag;
      Lisp_Object histvar;
      Lisp_Object histpos;
 {
   register Lisp_Object val;
   int count = specpdl_ptr - specpdl;
-  Lisp_Object mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
+  Lisp_Object mini_frame;
   struct gcpro gcpro1, gcpro2;
 
   if (XTYPE (prompt) != Lisp_String)
@@ -153,11 +153,12 @@
 
   /* If the minibuffer window is on a different frame, save that
      frame's configuration too.  */
+#ifdef MULTI_FRAME
+  XSET (mini_frame, Lisp_Frame, WINDOW_FRAME (XWINDOW (minibuf_window)));
   if (XFRAME (mini_frame) != selected_frame)
-    {
-      record_unwind_protect (Fset_window_configuration,
-			     Fcurrent_window_configuration (mini_frame));
-    }
+    record_unwind_protect (Fset_window_configuration,
+			   Fcurrent_window_configuration (mini_frame));
+#endif
 
   val = current_buffer->directory;
   Fset_buffer (get_minibuffer (minibuf_level));