aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-07-14 14:34:18 -0700
committerPaul Eggert2011-07-14 14:34:18 -0700
commit5d856da6d0a36bf98db55c11d94099ecb20d6e6e (patch)
treea02ed8cf2f606aa10ced974d953a3b7999dfe28b
parent2fd0959ded01063e4a62c05e9d2d6b05cf6384c8 (diff)
downloademacs-5d856da6d0a36bf98db55c11d94099ecb20d6e6e.tar.gz
emacs-5d856da6d0a36bf98db55c11d94099ecb20d6e6e.zip
* xdisp.c (reseat_to_string): Fix pointer signedness issue.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 50a2d82fc7e..960ab3d0775 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-07-14 Paul Eggert <eggert@cs.ucla.edu>
2
3 * xdisp.c (reseat_to_string): Fix pointer signedness issue.
4
12011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org> 52011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * data.c (Fcdr, Fcar): Revert the last change, since it didn't 7 * data.c (Fcdr, Fcar): Revert the last change, since it didn't
diff --git a/src/xdisp.c b/src/xdisp.c
index f8b4e65a7e5..69a66a4db64 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5890,7 +5890,7 @@ reseat_to_string (struct it *it, const char *s, Lisp_Object string,
5890 if (it->bidi_p) 5890 if (it->bidi_p)
5891 { 5891 {
5892 it->bidi_it.string.lstring = Qnil; 5892 it->bidi_it.string.lstring = Qnil;
5893 it->bidi_it.string.s = s; 5893 it->bidi_it.string.s = (const unsigned char *) s;
5894 it->bidi_it.string.schars = it->end_charpos; 5894 it->bidi_it.string.schars = it->end_charpos;
5895 it->bidi_it.string.bufpos = 0; 5895 it->bidi_it.string.bufpos = 0;
5896 it->bidi_it.string.from_disp_str = 0; 5896 it->bidi_it.string.from_disp_str = 0;