Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
a29eb766
Commit
a29eb766
authored
Aug 13, 2011
by
Paul Eggert
Browse files
* src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch.
parent
19d5c50c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
2 deletions
+0
-2
src/xdisp.c
src/xdisp.c
+0
-2
No files found.
src/xdisp.c
View file @
a29eb766
...
...
@@ -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. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment