procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Paul Eggert 2011-08-13 23:04:44 -07:00
parent 19d5c50cbb
commit a29eb766a6
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/xdisp.c
View file

@ -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. */