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
/
nsmenu.m
diff --git
a/src/nsmenu.m
b/src/nsmenu.m
index
6bde229
..
9512829
100644
(file)
--- a/
src/nsmenu.m
+++ b/
src/nsmenu.m
@@
-1014,7
+1014,7
@@
update_frame_tool_bar (FRAME_PTR f)
BOOL enabled_p = !NILP (TOOLPROP (TOOL_BAR_ITEM_ENABLED_P));
BOOL selected_p = !NILP (TOOLPROP (TOOL_BAR_ITEM_SELECTED_P));
int idx;
-
in
t img_id;
+
ptrdiff_
t img_id;
struct image *img;
Lisp_Object image;
Lisp_Object helpObj;