diff options
| author | Paul Eggert | 2015-01-04 13:20:36 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-01-04 13:21:03 -0800 |
| commit | bf90e9ac7caec15b0f111e0bb67e311233f3a795 (patch) | |
| tree | fea081a587642f7d542ff0ec008310d38b575304 /src/window.c | |
| parent | cde73794f61fec2a5a8676c2e36ec6634e72cdc5 (diff) | |
| download | emacs-bf90e9ac7caec15b0f111e0bb67e311233f3a795.tar.gz emacs-bf90e9ac7caec15b0f111e0bb67e311233f3a795.zip | |
'temacs -nw' should not call missing functions
Without this patch, "temacs -nw" fails with the diagnostic
"emacs: Symbol's function definition is void: frame-windows-min-size"
and messes up the tty's state.
* lib-src/make-docfile.c (write_globals):
Declare Fframe_windows_min_size with ATTRIBUTE_CONST, too. Sort.
* src/frame.c (Fframe_windows_min_size): New placeholder function.
(syms_of_frame): Define it.
* src/window.c (Fwindow__sanitize_window_sizes): New placeholder.
(syms_of_window): Define it.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/window.c b/src/window.c index 938f1a3268f..45dfb9ea1c2 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -3014,6 +3014,14 @@ resize_root_window (Lisp_Object window, Lisp_Object delta, Lisp_Object horizonta | |||
| 3014 | return call5 (Qwindow_resize_root_window, window, delta, horizontal, ignore, pixelwise); | 3014 | return call5 (Qwindow_resize_root_window, window, delta, horizontal, ignore, pixelwise); |
| 3015 | } | 3015 | } |
| 3016 | 3016 | ||
| 3017 | /* Placeholder used by temacs -nw before window.el is loaded. */ | ||
| 3018 | DEFUN ("window--sanitize-window-sizes", Fwindow__sanitize_window_sizes, | ||
| 3019 | Swindow__sanitize_window_sizes, 2, 2, 0, | ||
| 3020 | doc: /* */) | ||
| 3021 | (Lisp_Object frame, Lisp_Object horizontal) | ||
| 3022 | { | ||
| 3023 | return Qnil; | ||
| 3024 | } | ||
| 3017 | 3025 | ||
| 3018 | Lisp_Object | 3026 | Lisp_Object |
| 3019 | sanitize_window_sizes (Lisp_Object frame, Lisp_Object horizontal) | 3027 | sanitize_window_sizes (Lisp_Object frame, Lisp_Object horizontal) |
| @@ -7563,6 +7571,7 @@ displayed after a scrolling operation to be somewhat inaccurate. */); | |||
| 7563 | defsubr (&Sset_window_display_table); | 7571 | defsubr (&Sset_window_display_table); |
| 7564 | defsubr (&Snext_window); | 7572 | defsubr (&Snext_window); |
| 7565 | defsubr (&Sprevious_window); | 7573 | defsubr (&Sprevious_window); |
| 7574 | defsubr (&Swindow__sanitize_window_sizes); | ||
| 7566 | defsubr (&Sget_buffer_window); | 7575 | defsubr (&Sget_buffer_window); |
| 7567 | defsubr (&Sdelete_other_windows_internal); | 7576 | defsubr (&Sdelete_other_windows_internal); |
| 7568 | defsubr (&Sdelete_window_internal); | 7577 | defsubr (&Sdelete_window_internal); |