Commit a29eb766 authored by Paul Eggert's avatar Paul Eggert
Browse files

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

parent 19d5c50c
......@@ -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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment