HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19d5c50
)
* src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch.
author
Paul Eggert
<eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:04:44 +0000
(23:04 -0700)
committer
Paul Eggert
<eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:04:44 +0000
(23:04 -0700)
src/xdisp.c
patch
|
blob
|
blame
|
history
diff --git
a/src/xdisp.c
b/src/xdisp.c
index
6173ef4
..
a3bdcbd
100644
(file)
--- 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. */