aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2015-01-04 13:20:36 -0800
committerPaul Eggert2015-01-04 13:21:03 -0800
commitbf90e9ac7caec15b0f111e0bb67e311233f3a795 (patch)
treefea081a587642f7d542ff0ec008310d38b575304 /lib-src
parentcde73794f61fec2a5a8676c2e36ec6634e72cdc5 (diff)
downloademacs-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 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/make-docfile.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 5d17324fdce..acbbd3a02df 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,9 @@
12015-01-04 Paul Eggert <eggert@cs.ucla.edu> 12015-01-04 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 'temacs -nw' should not call missing functions
4 * make-docfile.c (write_globals):
5 Declare Fframe_windows_min_size with ATTRIBUTE_CONST, too. Sort.
6
3 Less 'make' chatter for lib-src 7 Less 'make' chatter for lib-src
4 * Makefile.in (blessmail): Less 'make' chatter here. 8 * Makefile.in (blessmail): Less 'make' chatter here.
5 9
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 78becac6c8a..f74b3d516d1 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -658,9 +658,10 @@ write_globals (void)
658 /* It would be nice to have a cleaner way to deal with these 658 /* It would be nice to have a cleaner way to deal with these
659 special hacks, too. */ 659 special hacks, too. */
660 if (strcmp (globals[i].name, "Fbyteorder") == 0 660 if (strcmp (globals[i].name, "Fbyteorder") == 0
661 || strcmp (globals[i].name, "Ftool_bar_height") == 0 661 || strcmp (globals[i].name, "Fframe_windows_min_size") == 0
662 || strcmp (globals[i].name, "Fidentity") == 0
662 || strcmp (globals[i].name, "Fmax_char") == 0 663 || strcmp (globals[i].name, "Fmax_char") == 0
663 || strcmp (globals[i].name, "Fidentity") == 0) 664 || strcmp (globals[i].name, "Ftool_bar_height") == 0)
664 fputs (" ATTRIBUTE_CONST", stdout); 665 fputs (" ATTRIBUTE_CONST", stdout);
665 666
666 puts (";"); 667 puts (";");