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

* src/window.c: Fix bootstrap failure due to window.el changes

Browse source 
(sanitize_window_sizes): Adjust to new calling convention of
window--sanitize-window-sizes and only call it if defined.
(Fwindow__sanitize_window_sizes): Remove.
(syms_of_window): Don't defsubr it.
This commit is contained in:
Stefan Monnier 2016-08-02 19:45:30 -04:00
parent 5083499205
commit 49e0c276b2
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/window.c
View file

@ -2867,20 +2867,11 @@ resize_root_window (Lisp_Object window, Lisp_Object delta,
horizontal, ignore, pixelwise);
}
/* Placeholder used by temacs -nw before window.el is loaded. */
DEFUN ("window--sanitize-window-sizes", Fwindow__sanitize_window_sizes,
Swindow__sanitize_window_sizes, 2, 2, 0,
doc: /* */
attributes: const)
(Lisp_Object frame, Lisp_Object horizontal)
{
return Qnil;
}
Lisp_Object
sanitize_window_sizes (Lisp_Object frame, Lisp_Object horizontal)
{
return call2 (Qwindow__sanitize_window_sizes, frame, horizontal);
if (!NILP (Fsymbol_function (Qwindow__sanitize_window_sizes)))
return call1 (Qwindow__sanitize_window_sizes, horizontal);
}
@ -7576,7 +7567,6 @@ displayed after a scrolling operation to be somewhat inaccurate. */);
defsubr (&Sset_window_display_table);
defsubr (&Snext_window);
defsubr (&Sprevious_window);
defsubr (&Swindow__sanitize_window_sizes);
defsubr (&Sget_buffer_window);
defsubr (&Sdelete_other_windows_internal);
defsubr (&Sdelete_window_internal);