From a29eb766a697b646103c4cc8ab56795acce7beab Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 13 Aug 2011 23:04:44 -0700
Subject: [PATCH] * src/xdisp.c (compute_display_string_pos): Fix bzr merge
 glitch.

---
 src/xdisp.c | 2 --
 1 file changed, 2 deletions(-)

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.  */
-- 
2.11.4.GIT