Mercurial > emacs

diff src/dispnew.c @ 110598:ee58b36ab139

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove restriction on the number of glyphs in one composition.
author Kenichi Handa <handa@m17n.org>
date Mon, 27 Sep 2010 14:27:28 +0900
parents 9fa0b071facc
children 0e84d4500f6b
line wrap: on
line diff
--- a/src/dispnew.c	Wed Sep 22 11:56:28 2010 +0900
+++ b/src/dispnew.c	Mon Sep 27 14:27:28 2010 +0900
@@ -5457,8 +5457,8 @@
 	  if (img)
 	    {
 	      *dy -= row->ascent - glyph->ascent;
-	      *dx += glyph->slice.x;
-	      *dy += glyph->slice.y;
+	      *dx += glyph->slice.img.x;
+	      *dy += glyph->slice.img.y;
 	      /* Image slices positions are still relative to the entire image */
 	      *width = img->width;
 	      *height = img->height;
@@ -5620,8 +5620,8 @@
 	      if (img != NULL)
 		*object = img->spec;
 	      y0 -= row->ascent - glyph->ascent;
-	      x0 += glyph->slice.x;
-	      y0 += glyph->slice.y;
+	      x0 += glyph->slice.img.x;
+	      y0 += glyph->slice.img.y;
 	    }
 #endif
 	}