merge from upstream

2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 65cd07df0ae..0b06e5bf2c0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (rows_from_pos_range): Don't ignore glyphs whose object
+        is an integer, which is important for empty lines.  (Bug#9149)
+
 2011-07-22  Chong Yidong  <cyd@stupidchicken.com>
 
         * frame.c (Fmodify_frame_parameters): In tty case, update the
diff --git a/src/xdisp.c b/src/xdisp.c
index ecb7007e1f3..0effc63c3db 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25214,7 +25214,7 @@ rows_from_pos_range (struct window *w,
 
           while (g < e)
             {
-              if (BUFFERP (g->object)
+              if ((BUFFERP (g->object) || INTEGERP (g->object))
                   && start_charpos <= g->charpos && g->charpos < end_charpos)
                 *start = row;
               g++;
@@ -25264,7 +25264,7 @@ rows_from_pos_range (struct window *w,
 
           while (g < e)
             {
-              if (BUFFERP (g->object)
+              if ((BUFFERP (g->object) || INTEGERP (g->object))
                   && start_charpos <= g->charpos && g->charpos < end_charpos)
                 break;
               g++;