procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/window.c (sanitize_window_sizes): Remove unused arg `frame'

Browse source 
* src/window.h (sanitize_window_sizes): Adjust prototype.
* src/frame.c (adjust_frame_size): Adjust calls.
This commit is contained in:
Stefan Monnier 2016-08-02 22:43:11 -04:00
parent d98f783426
commit 5f0b1c307a
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/emacs.c
View file

@ -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

8
src/frame.c
View file

@ -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);

3
src/window.c
View file

@ -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);
}

2
src/window.h
View file

@ -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 *);