From b0d15b4f051853e76f6831886a4ad5f79cec4b46 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 20 Nov 2011 15:17:13 -0500
Subject: [PATCH] * src/window.c (get_phys_cursor_glyph): Fix Lisp_Object/int
 mixup.

---
 src/ChangeLog | 4 ++++
 src/window.c  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index d0d3363d522..56404765059 100644
--- 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 4a5dcd85631..21c0cea5d14 100644
--- 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
-- 
2.11.4.GIT