aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 95f6201b201..14a3f6d4315 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-02-04 Eli Zaretskii <eliz@gnu.org>
2
3 * w32.c (get_emacs_configuration_options): Include
4 --enable-checking, if specified, in the return value.
5
12012-02-04 Martin Rudalics <rudalics@gmx.at> 62012-02-04 Martin Rudalics <rudalics@gmx.at>
2 7
3 * dispnew.c (change_frame_size_1): Calculate new_frame_total_cols 8 * dispnew.c (change_frame_size_1): Calculate new_frame_total_cols
diff --git a/src/w32.c b/src/w32.c
index f610a36ecf4..3d3d33453c6 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1940,6 +1940,9 @@ get_emacs_configuration_options (void)
1940#ifdef EMACSDEBUG 1940#ifdef EMACSDEBUG
1941 " --no-opt", 1941 " --no-opt",
1942#endif 1942#endif
1943#ifdef ENABLE_CHECKING
1944 " --enable-checking",
1945#endif
1943 /* configure.bat already sets USER_CFLAGS and USER_LDFLAGS 1946 /* configure.bat already sets USER_CFLAGS and USER_LDFLAGS
1944 with a starting space to save work here. */ 1947 with a starting space to save work here. */
1945#ifdef USER_CFLAGS 1948#ifdef USER_CFLAGS