HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge from trunk.
[bpt/emacs.git]
/
src
/
xdisp.c
diff --git
a/src/xdisp.c
b/src/xdisp.c
index
0352867
..
4ea183c
100644
(file)
--- a/
src/xdisp.c
+++ b/
src/xdisp.c
@@
-21133,7
+21133,7
@@
calc_pixel_width_or_height (double *res, struct it *it, Lisp_Object prop,
if (FRAME_WINDOW_P (it->f)
&& valid_image_p (prop))
{
-
in
t id = lookup_image (it->f, prop);
+
ptrdiff_
t id = lookup_image (it->f, prop);
struct image *img = IMAGE_FROM_ID (it->f, id);
return OK_PIXELS (width_p ? img->width : img->height);