From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 14 Aug 2011 06:04:44 +0000 (-0700)
Subject: * src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch.
X-Git-Tag: emacs-pretest-24.0.90~104^2~124^2~59
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a29eb766a697b646103c4cc8ab56795acce7beab;p=emacs.git

* src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 6173ef4ce74..a3bdcbdf4c6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3166,8 +3166,6 @@ compute_display_string_pos (struct text_pos *position,
 
   *disp_prop_p = 1;
 
-  *disp_prop_p = 1;
-
   if (charpos >= eob
       /* We don't support display properties whose values are strings
 	 that have display string properties.  */