aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2015-01-13 15:22:19 -0800
committerPaul Eggert2015-01-13 15:23:03 -0800
commit785adfcc8dee02ac544f80e4f7f8d3d5b2965981 (patch)
tree459b4653c384bd48ea961dbc5da46461a72d90fa /src/ChangeLog
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 'src/ChangeLog')
-rw-r--r--src/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7ec6980bd08..8d05ec13295 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,16 @@
12015-01-13 Paul Eggert <eggert@cs.ucla.edu> 12015-01-13 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Don't say Fnext_read_file_uses_dialog_p is const
4 It's const only if a windowing system is not used; don't say it's
5 const otherwise. See:
6 http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00310.html
7 * fileio.c (next_read_file_uses_dialog_p): Remove.
8 Move guts back to ...
9 (Fnext_read_file_uses_dialog_p): ... here.
10 Don't declare as const, as make-docfile.c now has a special case
11 for this function. This is an ugly hack, but it's better than
12 lying to the compiler.
13
3 Remove now-unnecessary forward XTYPE decl 14 Remove now-unnecessary forward XTYPE decl
4 * lisp.h (XTYPE): Remove forward declaration. The recent merge 15 * lisp.h (XTYPE): Remove forward declaration. The recent merge
5 from emacs-24 fixed the problem in a better way, by moving XPNTR's 16 from emacs-24 fixed the problem in a better way, by moving XPNTR's