[Emacs-diffs] Changes to emacs/src/window.c

[Stefan Monnier]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.526 emacs/src/window.c:1.527
*** emacs/src/window.c:1.526    Thu Nov  3 21:13:57 2005
--- emacs/src/window.c  Fri Nov  4 21:37:02 2005
***************
*** 1996,2006 ****
            break;
  
          case GET_LRU_WINDOW:
!           /* t as arg means consider only full-width windows */
!           if (!NILP (obj) && !WINDOW_FULL_WIDTH_P (w))
!             break;
!           /* Ignore dedicated windows and minibuffers.  */
!           if (MINI_WINDOW_P (w) || (!mini && EQ (w->dedicated, Qt)))
              break;
            if (NILP (best_window)
                || (XFASTINT (XWINDOW (best_window)->use_time)
--- 1996,2008 ----
            break;
  
          case GET_LRU_WINDOW:
!           /* `obj' is an integer encoding a bitvector.
!              `obj & 1' means consider only full-width windows.
!              `obj & 2' means consider also dedicated windows. */
!           if (((XINT (obj) & 1) && !WINDOW_FULL_WIDTH_P (w))
!               || (!(XINT (obj) & 2) && EQ (w->dedicated, Qt))
!               /* Minibuffer windows are always ignored.  */
!               || MINI_WINDOW_P (w))
              break;
            if (NILP (best_window)
                || (XFASTINT (XWINDOW (best_window)->use_time)
***************
*** 2051,2059 ****
            break;
  
          case GET_LARGEST_WINDOW:
!           {
              /* Ignore dedicated windows and minibuffers.  */
!             if (MINI_WINDOW_P (w) || (!mini && EQ (w->dedicated, Qt)))
                break;
  
              if (NILP (best_window))
--- 2053,2061 ----
            break;
  
          case GET_LARGEST_WINDOW:
!           { /* nil `obj' means to ignore dedicated windows.  */
              /* Ignore dedicated windows and minibuffers.  */
!             if (MINI_WINDOW_P (w) || (NILP (obj) && EQ (w->dedicated, Qt)))
                break;
  
              if (NILP (best_window))
***************
*** 2163,2173 ****
  {
    register Lisp_Object w;
    /* First try for a window that is full-width */
!   w = window_loop (GET_LRU_WINDOW, Qt, !NILP (dedicated), frame);
    if (!NILP (w) && !EQ (w, selected_window))
      return w;
    /* If none of them, try the rest */
!   return window_loop (GET_LRU_WINDOW, Qnil, !NILP (dedicated), frame);
  }
  
  DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_window, 0, 2, 
0,
--- 2165,2179 ----
  {
    register Lisp_Object w;
    /* First try for a window that is full-width */
!   w = window_loop (GET_LRU_WINDOW,
!                  NILP (dedicated) ? make_number (1) : make_number (3),
!                  0, frame);
    if (!NILP (w) && !EQ (w, selected_window))
      return w;
    /* If none of them, try the rest */
!   return window_loop (GET_LRU_WINDOW,
!                     NILP (dedicated) ? make_number (0) : make_number (2),
!                     0, frame);
  }
  
  DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_window, 0, 2, 
0,
***************
*** 2183,2189 ****
      (frame, dedicated)
       Lisp_Object frame, dedicated;
  {
!   return window_loop (GET_LARGEST_WINDOW, Qnil, !NILP (dedicated),
                      frame);
  }
  
--- 2189,2195 ----
      (frame, dedicated)
       Lisp_Object frame, dedicated;
  {
!   return window_loop (GET_LARGEST_WINDOW, dedicated, 0,
                      frame);
  }