comparison src/minibuf.c @ 1317:b74069f669cc

* minibuf.c (read_minibuf): Don't bother to save the current frame's focus, and have read_minibuf_unwind restore it; saving and restoring the window configurations will take care of that. (read_minibuf_unwind): Don't worry about restoring the frame's focus.

1316:f09c5c6563b8

    }

  val = current_buffer->directory;
  Fset_buffer (get_minibuffer (minibuf_level));
  current_buffer->directory = val;
  Fmake_local_variable (Qprint_escape_newlines);
  print_escape_newlines = 1;

#ifdef MULTI_FRAME
  /* If the minibuffer window is on another frame, shift this frame's
     focus to that window, and arrange to put it back later.  */
  if (XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window)))
      != selected_frame)
    {
      record_unwind_protect (read_minibuf_unwind,
			     Fcons (Fselected_frame (),
				    FRAME_FOCUS_FRAME (selected_frame)));

      Fredirect_frame_focus (Fselected_frame (), mini_frame);
    }
  else
    record_unwind_protect (read_minibuf_unwind, Qnil);
#else
  record_unwind_protect (read_minibuf_unwind, Qnil);
#endif

  Vminibuf_scroll_window = selected_window;
  Fset_window_buffer (minibuf_window, Fcurrent_buffer ());
  Fselect_window (minibuf_window);
  XFASTINT (XWINDOW (minibuf_window)->hscroll) = 0;

  Vcurrent_prefix_arg = minibuf_save_vector[minibuf_level].current_prefix_arg;
  Vminibuffer_history_position
    = minibuf_save_vector[minibuf_level].history_position;
  Vminibuffer_history_variable
    = minibuf_save_vector[minibuf_level].history_variable;

#ifdef MULTI_FRAME
  /* Redirect the focus of the frame that called the minibuffer.  */
  if (CONSP (data))
    Fredirect_frame_focus (XCONS (data)->car, XCONS (data)->cdr);
#endif
}


/* This comment supplies the doc string for read-from-minibuffer, 
   for make-docfile to see.  We cannot put this in the real DEFUN

1317:b74069f669cc

    }

  val = current_buffer->directory;
  Fset_buffer (get_minibuffer (minibuf_level));
  current_buffer->directory = val;
  Fredirect_frame_focus (Fselected_frame (), mini_frame);
  Fmake_local_variable (Qprint_escape_newlines);
  print_escape_newlines = 1;

  record_unwind_protect (read_minibuf_unwind, Qnil);

  Vminibuf_scroll_window = selected_window;
  Fset_window_buffer (minibuf_window, Fcurrent_buffer ());
  Fselect_window (minibuf_window);
  XFASTINT (XWINDOW (minibuf_window)->hscroll) = 0;

  Vcurrent_prefix_arg = minibuf_save_vector[minibuf_level].current_prefix_arg;
  Vminibuffer_history_position
    = minibuf_save_vector[minibuf_level].history_position;
  Vminibuffer_history_variable
    = minibuf_save_vector[minibuf_level].history_variable;
}


/* This comment supplies the doc string for read-from-minibuffer, 
   for make-docfile to see.  We cannot put this in the real DEFUN