From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 28 Mar 2013 13:45:27 +0000 (+0200)
Subject: Fix bug #14073 with referencing window total number of columns.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~526^2~58
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21e930f8f78cec0ddcdb4bc13919847892782ec1;p=emacs.git

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".
---

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;