diff options
| author | Jan D | 2010-04-16 19:05:31 +0200 |
|---|---|---|
| committer | Jan D | 2010-04-16 19:05:31 +0200 |
| commit | 5ba5ec85f64d76dd6eb97c0ccb526fabf603b496 (patch) | |
| tree | 90f3740b11adead55bcc223ef151fbdddda93669 /src/xmenu.c | |
| parent | a20a9df3c0e7529fbca67cc72612a34f48e0b0a1 (diff) | |
| download | emacs-5ba5ec85f64d76dd6eb97c0ccb526fabf603b496.tar.gz emacs-5ba5ec85f64d76dd6eb97c0ccb526fabf603b496.zip | |
* xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index c8067a47deb..796dd3093e8 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -978,14 +978,9 @@ apply_systemfont_to_menu (w) | |||
| 978 | if (XtIsShell (w)) /* popup menu */ | 978 | if (XtIsShell (w)) /* popup menu */ |
| 979 | { | 979 | { |
| 980 | Widget *childs = NULL; | 980 | Widget *childs = NULL; |
| 981 | int num = 0; | ||
| 982 | 981 | ||
| 983 | XtVaGetValues (w, XtNnumChildren, &num, NULL); | ||
| 984 | if (num != 1) return; /* Should only be one. */ | ||
| 985 | |||
| 986 | childs[0] = 0; | ||
| 987 | XtVaGetValues (w, XtNchildren, &childs, NULL); | 982 | XtVaGetValues (w, XtNchildren, &childs, NULL); |
| 988 | if (childs && *childs) w = *childs; | 983 | if (*childs) w = *childs; |
| 989 | } | 984 | } |
| 990 | 985 | ||
| 991 | /* Only use system font if the default is used for the menu. */ | 986 | /* Only use system font if the default is used for the menu. */ |