[Emacs-diffs] /srv/bzr/emacs/trunk r106454: * src/window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup.

[Stefan Monnier]

------------------------------------------------------------
revno: 106454
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2011-11-20 15:17:13 -0500
message:
  * src/window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup.
modified:
  src/ChangeLog
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-20 19:35:27 +0000
+++ b/src/ChangeLog     2011-11-20 20:17:13 +0000
@@ -1,3 +1,7 @@
+2011-11-20  Stefan Monnier  <address@hidden>
+
+       * window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup.
+
 2011-11-20  Juanma Barranquero  <address@hidden>
 
        * nsfont.m (syms_of_nsfont) <ns-reg-to-script>: Fix typo.

=== modified file 'src/window.c'
--- a/src/window.c      2011-11-20 10:57:04 +0000
+++ b/src/window.c      2011-11-20 20:17:13 +0000
@@ -5783,7 +5783,7 @@
   if (!row->enabled_p)
     return NULL;
 
-  if (w->hscroll)
+  if (XINT (w->hscroll))
     {
       /* When the window is hscrolled, cursor hpos can legitimately be
         out of bounds, but we draw the cursor at the corresponding