[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patch] proposal tiny cleanup for window code
From: |
Dmitry Antipov |
Subject: |
[patch] proposal tiny cleanup for window code |
Date: |
Wed, 07 Nov 2007 13:58:03 +0300 |
User-agent: |
Thunderbird 2.0.0.6 (X11/20070926) |
I've found that too_small_ok member of struct window isn't used anywhere except
size_window,
so it looks like there are no reasons to have too_small_ok within struct
window...
Dmitry
Index: doc/lispref/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/lispref/ChangeLog,v
retrieving revision 1.15
diff -u -r1.15 ChangeLog
--- doc/lispref/ChangeLog 31 Oct 2007 04:08:29 -0000 1.15
+++ doc/lispref/ChangeLog 7 Nov 2007 07:00:59 -0000
@@ -1,3 +1,7 @@
+2007-11-07 Dmitry Antipov <address@hidden>
+
+ * internals.texi (Window Internals): Remove description of too_small_ok.
+
2007-10-31 Richard Stallman <address@hidden>
* strings.texi (Creating Strings): Null strings from concat not unique.
Index: doc/lispref/internals.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/lispref/internals.texi,v
retrieving revision 1.2
diff -u -r1.2 internals.texi
--- doc/lispref/internals.texi 6 Sep 2007 04:27:42 -0000 1.2
+++ doc/lispref/internals.texi 7 Nov 2007 07:00:59 -0000
@@ -1280,9 +1280,6 @@
address@hidden means current value of @code{start} was the beginning of a line
when it was chosen.
address@hidden too_small_ok
address@hidden means don't delete this window for becoming ``too small.''
-
@item height_fixed_p
This field is temporarily set to 1 to fix the height of the selected
window when the echo area is resized.
Index: src/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.5979
diff -u -r1.5979 ChangeLog
--- src/ChangeLog 6 Nov 2007 09:27:17 -0000 1.5979
+++ src/ChangeLog 7 Nov 2007 07:01:01 -0000
@@ -1,3 +1,8 @@
+2007-11-07 Dmitry Antipov <address@hidden>
+
+ * window.h (struct window): Remove too_small_ok.
+ * window.c (size_window): Replace too_small_ok with it's value.
+
2007-11-06 Jan Dj,Ad(Brv <address@hidden>
* gtkutil.c (xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Index: src/window.c
===================================================================
RCS file: /sources/emacs/emacs/src/window.c,v
retrieving revision 1.597
diff -u -r1.597 window.c
--- src/window.c 26 Oct 2007 20:56:47 -0000 1.597
+++ src/window.c 7 Nov 2007 07:01:01 -0000
@@ -3048,9 +3048,6 @@
safe_min_size = window_min_size_2 (w, 0);
}
- if (old_size < min_size && nodelete_p != 2)
- w->too_small_ok = Qt;
-
/* Move the following test here since otherwise the
preceding test doesn't make sense. martin. */
if (nodelete_p == 2)
@@ -3059,7 +3056,7 @@
/* Maybe delete WINDOW if it's too small. */
if (nodelete_p != 1 && !NILP (w->parent))
{
- if (!MINI_WINDOW_P (w) && !NILP (w->too_small_ok))
+ if (!MINI_WINDOW_P (w) && old_size < min_size && nodelete_p != 2)
min_size = width_p ? MIN_SAFE_WINDOW_WIDTH : MIN_SAFE_WINDOW_HEIGHT;
if (min_size < safe_min_size)
min_size = safe_min_size;
Index: src/window.h
===================================================================
RCS file: /sources/emacs/emacs/src/window.h,v
retrieving revision 1.73
diff -u -r1.73 window.h
--- src/window.h 2 Oct 2007 21:55:26 -0000 1.73
+++ src/window.h 7 Nov 2007 07:01:02 -0000
@@ -221,9 +221,6 @@
/* If redisplay in this window goes beyond this buffer position,
must run the redisplay-end-trigger-hook. */
Lisp_Object redisplay_end_trigger;
- /* Non-nil means don't delete this window for becoming "too small". */
- Lisp_Object too_small_ok;
-
/* Original window height and top before mini-window was
enlarged. */
Lisp_Object orig_total_lines, orig_top_line;
- [patch] proposal tiny cleanup for window code,
Dmitry Antipov <=