Merge from mainline.

1 files changed, 0 insertions, 3 deletions

diff --git a/src/window.h b/src/window.h
index ad627aca340..65d554a5501 100644
--- a/src/window.h
+++ b/src/window.h
@@ -763,8 +763,6 @@ extern Lisp_Object Vmouse_event;
 EXFUN (Fnext_window, 3);
 EXFUN (Fselect_window, 2);
 EXFUN (Fset_window_buffer, 3);
-EXFUN (Fset_window_vscroll, 3);
-EXFUN (Fset_window_margins, 3);
 EXFUN (Fset_window_point, 2);
 extern Lisp_Object make_window (void);
 extern Lisp_Object window_from_coordinates (struct frame *, int, int,
@@ -778,7 +776,6 @@ extern void freeze_window_starts (struct frame *, int);
 extern void grow_mini_window (struct window *, int);
 extern void shrink_mini_window (struct window *);
 extern int window_relative_x_coord (struct window *, enum window_part, int);
-extern void check_all_windows (void);
 
 void run_window_configuration_change_hook (struct frame *f);