[Emacs-diffs] /srv/bzr/emacs/trunk r106070: Fix bugs #9738 & 9739 with a display string that ends in 2 newlines.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106070
fixes bug(s): http://debbugs.gnu.org/9738 http://debbugs.gnu.org/9739
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2011-10-12 22:07:59 +0200
message:
  Fix bugs #9738 & 9739 with a display string that ends in 2 newlines.
  
   src/xdisp.c (find_row_edges): Handle the case where ROW comes from a
   display string and the previous row comes from the same string and
   is empty.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-12 19:08:04 +0000
+++ b/src/ChangeLog     2011-10-12 20:07:59 +0000
@@ -1,3 +1,9 @@
+2011-10-12  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (find_row_edges): Handle the case where ROW comes from a
+       display string and the previous row comes from the same string and
+       is empty.  (Bug#9739)  (Bug#9738)
+
 2011-10-12  Stefan Monnier  <address@hidden>
 
        * doc.c (get_doc_string): Encode file name (bug#9735).

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-10-12 15:12:52 +0000
+++ b/src/xdisp.c       2011-10-12 20:07:59 +0000
@@ -18646,7 +18646,12 @@
                    seen_this_string = 1;
                }
              else
-               abort ();
+               /* If all the glyphs of the previous row were inserted
+                  by redisplay, it means the previous row was
+                  produced from a single newline, which is only
+                  possible if that newline came from the same string
+                  as the one which produced this ROW.  */
+               seen_this_string = 1;
            }
          else
            {
@@ -18662,7 +18667,7 @@
                    seen_this_string = 1;
                }
              else
-               abort ();
+               seen_this_string = 1;
            }
        }
       /* Take note of each display string that covers a newline only