emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-24 r117352: Fix bug #17942 with pos-visible-in-windo


From: Eli Zaretskii
Subject: [Emacs-diffs] emacs-24 r117352: Fix bug #17942 with pos-visible-in-window-p and image and BOB.
Date: Sat, 05 Jul 2014 07:39:30 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117352
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 10:38:13 +0300
message:
  Fix bug #17942 with pos-visible-in-window-p and image and BOB.
  
   src/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.
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 02:17:14 +0000
+++ b/src/ChangeLog     2014-07-05 07:38:13 +0000
@@ -1,3 +1,9 @@
+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)
+
 2014-07-05  Stefan Monnier  <address@hidden>
 
        * syntax.c (find_defun_start): Try the cache even

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2014-07-04 13:22:04 +0000
+++ b/src/xdisp.c       2014-07-05 07:38:13 +0000
@@ -1585,7 +1585,8 @@
                  /* Move to the last buffer position before the
                     display property.  */
                  start_display (&it3, w, top);
-                 move_it_to (&it3, start - 1, -1, -1, -1, MOVE_TO_POS);
+                 if (start > BEGV)
+                   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
                     rightmost character on a line that is


reply via email to

[Prev in Thread] Current Thread [Next in Thread]