aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/w32fns.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fcc8bb5eaa3..baa40ffd237 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,8 @@
3 * w32fns.c (w32_wnd_proc) [ENABLE_CHECKING]: Add code to help 3 * w32fns.c (w32_wnd_proc) [ENABLE_CHECKING]: Add code to help
4 identify the reasons for assertion violations in bug#14062 and 4 identify the reasons for assertion violations in bug#14062 and
5 similar ones. 5 similar ones.
6 (Fx_show_tip): Fix compilation error under
7 "--enable-check-lisp-object-type". (Bug#14073)
6 8
7 * image.c (g_error_free) [WINDOWSNT]: Add DEF_IMGLIB_FN. 9 * image.c (g_error_free) [WINDOWSNT]: Add DEF_IMGLIB_FN.
8 Reported by <rzl24ozi@gmail.com>. 10 Reported by <rzl24ozi@gmail.com>.
diff --git a/src/w32fns.c b/src/w32fns.c
index 02cc2a00338..bb640ffcb8c 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5810,7 +5810,7 @@ Text larger than the specified size is clipped. */)
5810 w->total_lines = 40; 5810 w->total_lines = 40;
5811 } 5811 }
5812 5812
5813 FRAME_TOTAL_COLS (f) = XINT (w->total_cols); 5813 FRAME_TOTAL_COLS (f) = WINDOW_TOTAL_COLS (w);
5814 adjust_glyphs (f); 5814 adjust_glyphs (f);
5815 w->pseudo_window_p = 1; 5815 w->pseudo_window_p = 1;
5816 5816