diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-13 23:04:44 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-13 23:04:44 -0700 |
| commit | a29eb766a697b646103c4cc8ab56795acce7beab (patch) | |
| tree | 20e8c6bbe9d544c223d33b9dfceddfdca3628d83 /src | |
| parent | 19d5c50cbb7d65bfed9e76ccf1c22bada0662f38 (diff) | |
| download | emacs-a29eb766a697b646103c4cc8ab56795acce7beab.tar.gz | |
* src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 2 |
1 files changed, 0 insertions, 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. */ |