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

a29eb766 · Paul Eggert · 19d5c50c · a29eb766
Commit a29eb766 authored Aug 13, 2011 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

src/xdisp.c src/xdisp.c +0 -2

No files found.
--- 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.  */