aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2015-01-13 15:22:19 -0800
committerPaul Eggert2015-01-13 15:23:03 -0800
commit785adfcc8dee02ac544f80e4f7f8d3d5b2965981 (patch)
tree459b4653c384bd48ea961dbc5da46461a72d90fa /lib-src
parent564784766297a6f2e06434e2baa7a1d851672a36 (diff)
downloademacs-785adfcc8dee02ac544f80e4f7f8d3d5b2965981.tar.gz
emacs-785adfcc8dee02ac544f80e4f7f8d3d5b2965981.zip
Don't say Fnext_read_file_uses_dialog_p is const
It's const only if a windowing system is not used; don't say it's const otherwise. See: http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00310.html * lib-src/make-docfile.c (write_globals): Add a special hack for Fnext_read_file_uses_dialog_p. * src/fileio.c (next_read_file_uses_dialog_p): Remove. Move guts back to ... (Fnext_read_file_uses_dialog_p): ... here. Don't declare as const, as make-docfile.c now has a special case for this function. This is an ugly hack, but it's better than lying to the compiler.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lib-src/make-docfile.c12
2 files changed, 18 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 969aac80124..e9205fdd12a 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
12015-01-13 Paul Eggert <eggert@cs.ucla.edu>
2
3 Don't say Fnext_read_file_uses_dialog_p is const
4 * make-docfile.c (write_globals):
5 Add a special hack for Fnext_read_file_uses_dialog_p.
6
12015-01-13 Dmitry Antipov <dmantipov@yandex.ru> 72015-01-13 Dmitry Antipov <dmantipov@yandex.ru>
2 8
3 Support DEFUN attributes. 9 Support DEFUN attributes.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 79d421a0a8e..741fa4bfa42 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -729,6 +729,18 @@ write_globals (void)
729 729
730 if (globals[i].flags & DEFUN_const) 730 if (globals[i].flags & DEFUN_const)
731 fputs (" ATTRIBUTE_CONST", stdout); 731 fputs (" ATTRIBUTE_CONST", stdout);
732 else if (strcmp (globals[i].name, "Fnext_read_file_uses_dialog_p")
733 == 0)
734 {
735 /* It would be nice to have a cleaner way to deal with this
736 special hack. */
737 fputs (("\n"
738 "#if ! (defined USE_GTK || defined USE_MOTIF \\\n"
739 " || defined HAVE_NS || defined HAVE_NTGUI)\n"
740 "\tATTRIBUTE_CONST\n"
741 "#endif\n"),
742 stdout);
743 }
732 744
733 puts (";"); 745 puts (";");
734 } 746 }