Merge from trunk.

1 files changed, 6 insertions, 10 deletions

diff --git a/src/window.h b/src/window.h
index c33179de9ba..236464775d3 100644
--- a/src/window.h
+++ b/src/window.h
@@ -261,12 +261,6 @@ struct window
     /* 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 resizing windows will attempt to resize this window
-       proportionally.  */
-    Lisp_Object resize_proportionally;
-
-    /* Original window height and top before mini-window was enlarged. */
-    Lisp_Object orig_total_lines, orig_top_line;
 
     /* Non-nil means deleting or resizing this window distributes
        space among all windows in the same combination.  */
@@ -833,9 +827,6 @@ extern Lisp_Object make_window (void);
 extern Lisp_Object window_from_coordinates (struct frame *, int, int,
                                             enum window_part *, int);
 EXFUN (Fwindow_dedicated_p, 1);
-extern void set_window_height (Lisp_Object, int, int);
-extern void set_window_width (Lisp_Object, int, int);
-extern void change_window_heights (Lisp_Object, int);
 extern void delete_all_subwindows (Lisp_Object);
 extern void freeze_window_starts (struct frame *, int);
 extern void grow_mini_window (struct window *, int);
@@ -918,7 +909,6 @@ EXFUN (Fselected_window, 0);
 EXFUN (Fframe_root_window, 1);
 EXFUN (Fframe_first_window, 1);
 EXFUN (Fset_frame_selected_window, 3);
-EXFUN (Fdelete_window, 1);
 EXFUN (Fset_window_configuration, 1);
 EXFUN (Fcurrent_window_configuration, 1);
 extern int compare_window_configurations (Lisp_Object, Lisp_Object, int);
@@ -933,5 +923,11 @@ extern void init_window_once (void);
 extern void init_window (void);
 extern void syms_of_window (void);
 extern void keys_of_window (void);
+extern void resize_frame_windows (struct frame *, int, int);
+extern int resize_window_check (struct window *, int);
+extern Lisp_Object delete_deletable_window (Lisp_Object);
+extern Lisp_Object resize_root_window (Lisp_Object, Lisp_Object, Lisp_Object,
+                                       Lisp_Object);
+
 
 #endif /* not WINDOW_H_INCLUDED */