From 5f0b1c307a7d66ee8d2afa2eff982866785f60dd Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 2 Aug 2016 22:43:11 -0400
Subject: [PATCH] * src/window.c (sanitize_window_sizes): Remove unused arg
 `frame'

* src/window.h (sanitize_window_sizes): Adjust prototype.
* src/frame.c (adjust_frame_size): Adjust calls.
---
 src/emacs.c  | 2 +-
 src/frame.c  | 8 ++++----
 src/window.c | 3 ++-
 src/window.h | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/emacs.c b/src/emacs.c
index 53bcc9879a9..85fb22bc977 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -668,7 +668,7 @@ main (int argc, char **argv)
   bool do_initial_setlocale;
   bool dumping;
   int skip_args = 0;
-  bool no_loadup = 0;
+  bool no_loadup = false;
   char *junk = 0;
   char *dname_arg = 0;
 #ifdef DAEMON_MUST_EXEC
diff --git a/src/frame.c b/src/frame.c
index 22143ab26bf..899c315016b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -501,8 +501,8 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit,
       && new_lines == old_lines)
     /* No change.  Sanitize window sizes and return.  */
     {
-      sanitize_window_sizes (frame, Qt);
-      sanitize_window_sizes (frame, Qnil);
+      sanitize_window_sizes (Qt);
+      sanitize_window_sizes (Qnil);
 
       return;
     }
@@ -582,8 +582,8 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit,
   }
 
   /* Sanitize window sizes.  */
-  sanitize_window_sizes (frame, Qt);
-  sanitize_window_sizes (frame, Qnil);
+  sanitize_window_sizes (Qt);
+  sanitize_window_sizes (Qnil);
 
   adjust_frame_glyphs (f);
   calculate_costs (f);
diff --git a/src/window.c b/src/window.c
index a3fbffc450d..374ef0f838f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2868,8 +2868,9 @@ resize_root_window (Lisp_Object window, Lisp_Object delta,
 }
 
 void
-sanitize_window_sizes (Lisp_Object frame, Lisp_Object horizontal)
+sanitize_window_sizes (Lisp_Object horizontal)
 {
+  /* Don't burp in temacs -nw before window.el is loaded.  */
   if (!NILP (Fsymbol_function (Qwindow__sanitize_window_sizes)))
     call1 (Qwindow__sanitize_window_sizes, horizontal);
 }
diff --git a/src/window.h b/src/window.h
index 268e0f2c1b0..c2898194854 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1105,7 +1105,7 @@ extern int window_body_width (struct window *w, bool);
 extern void temp_output_buffer_show (Lisp_Object);
 extern void replace_buffer_in_windows (Lisp_Object);
 extern void replace_buffer_in_windows_safely (Lisp_Object);
-extern void sanitize_window_sizes (Lisp_Object, Lisp_Object);
+extern void sanitize_window_sizes (Lisp_Object horizontal);
 /* This looks like a setter, but it is a bit special.  */
 extern void wset_buffer (struct window *, Lisp_Object);
 extern bool window_outdated (struct window *);
-- 
2.11.4.GIT