* src/window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup.

diff --git a/src/ChangeLog b/src/ChangeLog
index d0d3363d52283c0bf50664e465d84d807425b6cd..564047650598aeb2e10cdd0b6154b3fcf1fc50c3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup.
+
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 
        * nsfont.m (syms_of_nsfont) <ns-reg-to-script>: Fix typo.

diff --git a/src/window.c b/src/window.c
index 4a5dcd85631915de3e42b02b71cfee2eafbdc0d3..21c0cea5d1410d13be23ea2e0bad357901d75c41 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -5783,7 +5783,7 @@ get_phys_cursor_glyph (struct window *w)
   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