From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 31 May 2007 01:03:23 +0000 (+0000)
Subject: (fill_composite_glyph_string): Make the first arg to
X-Git-Tag: emacs-pretest-23.0.90~8295^2~486
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=20c41c132060b779471d71c023b4feae723be223;p=emacs.git

(fill_composite_glyph_string): Make the first arg to
STORE_XCHARB a valid l-value.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 1cc8cf10611..268def4a0f2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19154,11 +19154,12 @@ fill_composite_glyph_string (s, base_face, overlaps)
 	{
 	  Lisp_Object g = LGSTRING_GLYPH (gstring, i);
 	  unsigned code;
-
+          XChar2b * store_pos;
 	  if (NILP (LGLYPH_FROM (g)))
 	    break;
 	  code = XUINT (LGLYPH_CODE (g));
-	  STORE_XCHAR2B (s->char2b + i, code >> 8, code & 0xFF);
+          store_pos = s->char2b + i;
+	  STORE_XCHAR2B (store_pos, code >> 8, code & 0xFF);
 	}
       s->width = s->cmp->pixel_width;
     }