emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Martin Rudalics
Subject: [Emacs-diffs] Changes to emacs/src/window.c,v [EMACS_22_BASE]
Date: Fri, 26 Oct 2007 20:49:13 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Martin Rudalics <m061211>       07/10/26 20:49:13

Index: window.c
===================================================================
RCS file: /sources/emacs/emacs/src/window.c,v
retrieving revision 1.575.2.5
retrieving revision 1.575.2.6
diff -u -b -r1.575.2.5 -r1.575.2.6
--- window.c    6 Aug 2007 06:44:31 -0000       1.575.2.5
+++ window.c    26 Oct 2007 20:49:12 -0000      1.575.2.6
@@ -2665,9 +2665,8 @@
 }
 
 /* Return the minimum size for leaf window W.  WIDTH_P non-zero means
-   take into account fringes and the scrollbar of W.  WIDTH_P zero
-   means take into account mode-line and header-line of W.  Return 1
-   for the minibuffer.  */
+   take into account fringes and the scrollbar of W.  WIDTH_P zero means
+   take into account mode-line of W.  Return 1 for the minibuffer.  */
 
 static int
 window_min_size_2 (w, width_p)
@@ -2686,8 +2685,11 @@
   else
     size = max (window_min_height,
                (MIN_SAFE_WINDOW_HEIGHT
-                + (WINDOW_WANTS_MODELINE_P (w) ? 1 : 0)
-                + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0 )));
+                /* Don't count the header-line here.  It would break
+                   splitting a window with a header-line when the new
+                   window shall have a height of two (calculator does
+                   that). */
+                + (WINDOW_WANTS_MODELINE_P (w) ? 1 : 0)));
 
   return size;
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]