[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/window.c,v
From: |
Martin Rudalics |
Subject: |
[Emacs-diffs] Changes to emacs/src/window.c,v |
Date: |
Tue, 17 Jul 2007 07:22:59 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Martin Rudalics <m061211> 07/07/17 07:22:59
Index: window.c
===================================================================
RCS file: /sources/emacs/emacs/src/window.c,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -b -r1.580 -r1.581
--- window.c 16 Jul 2007 13:21:53 -0000 1.580
+++ window.c 17 Jul 2007 07:22:59 -0000 1.581
@@ -3738,12 +3738,13 @@
else
window = Fget_largest_window (frames, Qt);
- /* If we got a tall enough full-width window that can be split,
- split it. */
+ /* If the largest window is tall enough, full-width, and either eligible
+ for splitting or the only window, split it. */
if (!NILP (window)
&& ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
&& WINDOW_FULL_WIDTH_P (XWINDOW (window))
- && window_height (window) >= split_height_threshold
+ && (window_height (window) >= split_height_threshold
+ || (NILP (XWINDOW (window)->parent)))
&& (window_height (window)
>= (2 * window_min_size_2 (XWINDOW (window), 0))))
window = Fsplit_window (window, Qnil, Qnil);
@@ -3752,13 +3753,13 @@
Lisp_Object upper, lower, other;
window = Fget_lru_window (frames, Qt);
- /* If the LRU window is selected, and big enough,
- and can be split, split it. */
+ /* If the LRU window is tall enough, and either eligible for splitting
+ and selected or the only window, split it. */
if (!NILP (window)
&& ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
- && (EQ (window, selected_window)
- || NILP (XWINDOW (window)->parent))
- && window_height (window) >= split_height_threshold
+ && ((EQ (window, selected_window)
+ && window_height (window) >= split_height_threshold)
+ || (NILP (XWINDOW (window)->parent)))
&& (window_height (window)
>= (2 * window_min_size_2 (XWINDOW (window), 0))))
window = Fsplit_window (window, Qnil, Qnil);
@@ -7601,4 +7602,4 @@
}
/* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f
- (do not change this comment) */
+ (do not change thisc omment) */
- [Emacs-diffs] Changes to emacs/src/window.c,v, Juanma Barranquero, 2007/07/14
- [Emacs-diffs] Changes to emacs/src/window.c,v, Martin Rudalics, 2007/07/15
- [Emacs-diffs] Changes to emacs/src/window.c,v, Andreas Schwab, 2007/07/16
- [Emacs-diffs] Changes to emacs/src/window.c,v,
Martin Rudalics <=
- [Emacs-diffs] Changes to emacs/src/window.c,v, Martin Rudalics, 2007/07/19
- [Emacs-diffs] Changes to emacs/src/window.c,v, Miles Bader, 2007/07/26