/[emacs]/emacs/src/window.c
ViewVC logotype

Diff of /emacs/src/window.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.402 by kfstorm, Wed Feb 13 22:41:12 2002 UTC revision 1.403 by kfstorm, Tue Feb 26 22:50:55 2002 UTC
# Line 120  Lisp_Object Vwindow_list; Line 120  Lisp_Object Vwindow_list;
120    
121  Lisp_Object minibuf_window;  Lisp_Object minibuf_window;
122    
123    /* Non-nil means it is the window whose mode line should be
124       shown as the selected window when the minibuffer is selected.  */
125    
126    Lisp_Object Vminibuf_selected_window;
127    
128  /* Non-nil means it is the window for C-M-v to scroll  /* Non-nil means it is the window for C-M-v to scroll
129     when the mini-buffer is selected.  */     when the mini-buffer is selected.  */
130    
# Line 4793  struct save_window_data Line 4798  struct save_window_data
4798      Lisp_Object current_window;      Lisp_Object current_window;
4799      Lisp_Object current_buffer;      Lisp_Object current_buffer;
4800      Lisp_Object minibuf_scroll_window;      Lisp_Object minibuf_scroll_window;
4801        Lisp_Object minibuf_selected_window;
4802      Lisp_Object root_window;      Lisp_Object root_window;
4803      Lisp_Object focus_frame;      Lisp_Object focus_frame;
4804      /* Record the values of window-min-width and window-min-height      /* Record the values of window-min-width and window-min-height
# Line 5156  the return value is nil.  Otherwise the Line 5162  the return value is nil.  Otherwise the
5162    window_min_width = XINT (data->min_width);    window_min_width = XINT (data->min_width);
5163    
5164    Vminibuf_scroll_window = data->minibuf_scroll_window;    Vminibuf_scroll_window = data->minibuf_scroll_window;
5165      Vminibuf_selected_window = data->minibuf_selected_window;
5166    
5167    return (FRAME_LIVE_P (f) ? Qt : Qnil);    return (FRAME_LIVE_P (f) ? Qt : Qnil);
5168  }  }
# Line 5365  redirection (see `redirect-frame-focus') Line 5372  redirection (see `redirect-frame-focus')
5372    data->selected_frame = selected_frame;    data->selected_frame = selected_frame;
5373    data->current_window = FRAME_SELECTED_WINDOW (f);    data->current_window = FRAME_SELECTED_WINDOW (f);
5374    XSETBUFFER (data->current_buffer, current_buffer);    XSETBUFFER (data->current_buffer, current_buffer);
5375    data->minibuf_scroll_window = Vminibuf_scroll_window;    data->minibuf_scroll_window = minibuf_level > 0 ? Vminibuf_scroll_window : Qnil;
5376      data->minibuf_selected_window = minibuf_level > 0 ? Vminibuf_selected_window : Qnil;
5377    data->root_window = FRAME_ROOT_WINDOW (f);    data->root_window = FRAME_ROOT_WINDOW (f);
5378    data->focus_frame = FRAME_FOCUS_FRAME (f);    data->focus_frame = FRAME_FOCUS_FRAME (f);
5379    XSETINT (data->min_height, window_min_height);    XSETINT (data->min_height, window_min_height);
# Line 5649  compare_window_configurations (c1, c2, i Line 5657  compare_window_configurations (c1, c2, i
5657    if (! EQ (d1->current_buffer, d2->current_buffer))    if (! EQ (d1->current_buffer, d2->current_buffer))
5658      return 0;      return 0;
5659    if (! ignore_positions)    if (! ignore_positions)
5660      if (! EQ (d1->minibuf_scroll_window, d2->minibuf_scroll_window))      {
5661        return 0;        if (! EQ (d1->minibuf_scroll_window, d2->minibuf_scroll_window))
5662            return 0;
5663          if (! EQ (d1->minibuf_selected_window, d2->minibuf_selected_window))
5664            return 0;
5665        }
5666    /* Don't compare the root_window field.    /* Don't compare the root_window field.
5667       We don't require the two configurations       We don't require the two configurations
5668       to use the same window object,       to use the same window object,

Legend:
Removed from v.1.402  
changed lines
  Added in v.1.403

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26