diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-03-28 15:45:27 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-03-28 15:45:27 +0200 |
| commit | 21e930f8f78cec0ddcdb4bc13919847892782ec1 (patch) | |
| tree | 074ab48e141edbbb98cada43e29280c6b88c16c7 | |
| parent | c7f53895b9e314345c08f000751a863bf78f7e18 (diff) | |
| download | emacs-21e930f8f78cec0ddcdb4bc13919847892782ec1.tar.gz | |
Fix bug #14073 with referencing window total number of columns.
src/w32fns.c (Fx_show_tip): Fix compilation error under
"--enable-check-lisp-object-type".
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/w32fns.c | 2 |
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 @@ * w32fns.c (w32_wnd_proc) [ENABLE_CHECKING]: Add code to help identify the reasons for assertion violations in bug#14062 and similar ones. + (Fx_show_tip): Fix compilation error under + "--enable-check-lisp-object-type". (Bug#14073) * image.c (g_error_free) [WINDOWSNT]: Add DEF_IMGLIB_FN. 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. */) w->total_lines = 40; } - FRAME_TOTAL_COLS (f) = XINT (w->total_cols); + FRAME_TOTAL_COLS (f) = WINDOW_TOTAL_COLS (w); adjust_glyphs (f); w->pseudo_window_p = 1; |