[Emacs-diffs] /srv/bzr/emacs/trunk r112169: Fix bug #14073 with referencing window total number of columns.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112169
fixes bug: http://debbugs.gnu.org/14073
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2013-03-28 15:45:27 +0200
message:
  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".
modified:
  src/ChangeLog
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-28 09:25:25 +0000
+++ b/src/ChangeLog     2013-03-28 13:45:27 +0000
@@ -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 <address@hidden>.

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2013-03-28 09:18:16 +0000
+++ b/src/w32fns.c      2013-03-28 13:45:27 +0000
@@ -5810,7 +5810,7 @@
       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;