[Emacs-diffs] emacs-24 r117353: A better fix for bug #17942.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117353
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17942
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-07-05 11:24:07 +0300
message:
  A better fix for bug #17942.
  
   src/xdisp.c (pos_visible_p): If CHARPOS is at beginning of window,
   and there is a display property at that position, don't call
   move_it_to to move to a position before window start.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-05 07:38:13 +0000
+++ b/src/ChangeLog     2014-07-05 08:24:07 +0000
@@ -1,8 +1,8 @@
 2014-07-05  Eli Zaretskii  <address@hidden>
 
-       * xdisp.c (pos_visible_p): If CHARPOS is at BEGV, and there is a
-       display property at BEGV, don't call move_it_to to move to a
-       position before BEGV.  (Bug#17942)
+       * xdisp.c (pos_visible_p): If CHARPOS is at beginning of window,
+       and there is a display property at that position, don't call
+       move_it_to to move to a position before window start.  (Bug#17942)
 
 2014-07-05  Stefan Monnier  <address@hidden>
 

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2014-07-05 07:38:13 +0000
+++ b/src/xdisp.c       2014-07-05 08:24:07 +0000
@@ -1585,7 +1585,7 @@
                  /* Move to the last buffer position before the
                     display property.  */
                  start_display (&it3, w, top);
-                 if (start > BEGV)
+                 if (start > CHARPOS (top))
                    move_it_to (&it3, start - 1, -1, -1, -1, MOVE_TO_POS);
                  /* Move forward one more line if the position before
                     the display string is a newline or if it is the