* 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.

diff --git a/src/emacs.c b/src/emacs.c
index 53bcc9879a9a5671a47b67e2385286a75fe83e73..85fb22bc977727d577119cd3bd38c68c3f099a56 100644 (file)
--- 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 22143ab26bf827a635ca356db8c1d835896271f9..899c315016b89461ddd02ba8641e5d2426ef2882 100644 (file)
--- 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 a3fbffc450d91efad7593f624a0b94c3ff84ab16..374ef0f838f4370de7fe9fd9b9c6ee8b2e74b833 100644 (file)
--- 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 268e0f2c1b0ca58168b7aee553e49a3f94d3c2e3..c289819485484900d955db8d5594a7be747a736a 100644 (file)
--- 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 *);