[Emacs-diffs] emacs/src ChangeLog window.c

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/10/26 10:04:39

Modified files:
        src            : ChangeLog window.c 

Log message:
        * window.c (grow_mini_window): Comment out "delta >= 0" assertion.
          For delta < 0, skip check that only makes sense when the mini-window
          is going to be enlarged.  (Bug#4534)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7825&r2=1.7826
http://cvs.savannah.gnu.org/viewcvs/emacs/src/window.c?cvsroot=emacs&r1=1.642&r2=1.643

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7825
retrieving revision 1.7826
diff -u -b -r1.7825 -r1.7826
--- ChangeLog   25 Oct 2009 00:40:13 -0000      1.7825
+++ ChangeLog   26 Oct 2009 10:04:37 -0000      1.7826
@@ -1,3 +1,9 @@
+2009-10-26  Juanma Barranquero  <address@hidden>
+
+       * window.c (grow_mini_window): Comment out "delta >= 0" assertion.
+       For delta < 0, skip check that only makes sense when the mini-window
+       is going to be enlarged.  (Bug#4534)
+
 2009-10-25  Chong Yidong  <address@hidden>
 
        * keyboard.c (read_char_x_menu_prompt): Don't demand a prompt
@@ -20,8 +26,7 @@
        * lisp.h (FIXNUM_OVERFLOW_P): Fix last change to handle unsigned
        types again.
 
-       * sysdep.c (procfs_ttyname): Fix sprintf format to match argument
-       type.
+       * sysdep.c (procfs_ttyname): Fix sprintf format to match argument type.
        (system_process_attributes): Likewise.
 
 2009-10-24  Dan Nicolaescu  <address@hidden>

Index: window.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/window.c,v
retrieving revision 1.642
retrieving revision 1.643
diff -u -b -r1.642 -r1.643
--- window.c    23 Oct 2009 17:52:57 -0000      1.642
+++ window.c    26 Oct 2009 10:04:39 -0000      1.643
@@ -4648,12 +4648,15 @@
   struct window *root;
 
   xassert (MINI_WINDOW_P (w));
-  xassert (delta >= 0);
+  /* Commenting out the following assertion goes against the stated interface
+     of the function, but it currently does not seem to do anything useful.
+     See discussion of this issue in the thread for bug#4534.
+     xassert (delta >= 0); */
 
   /* Compute how much we can enlarge the mini-window without deleting
      other windows.  */
   root = XWINDOW (FRAME_ROOT_WINDOW (f));
-  if (delta)
+  if (delta > 0)
     {
       int min_height = window_min_size (root, 0, 0, 0, 0);
       if (XFASTINT (root->total_lines) - delta < min_height)