diff options
| author | Jan D <jan.h.d@swipnet.se> | 2010-04-16 19:05:31 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2010-04-16 19:05:31 +0200 |
| commit | 5ba5ec85f64d76dd6eb97c0ccb526fabf603b496 (patch) | |
| tree | 90f3740b11adead55bcc223ef151fbdddda93669 | |
| parent | a20a9df3c0e7529fbca67cc72612a34f48e0b0a1 (diff) | |
| download | emacs-5ba5ec85f64d76dd6eb97c0ccb526fabf603b496.tar.gz emacs-5ba5ec85f64d76dd6eb97c0ccb526fabf603b496.tar.bz2 emacs-5ba5ec85f64d76dd6eb97c0ccb526fabf603b496.zip | |
* xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xmenu.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 789f7dc8c56..99d41c6ca6c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-04-16 Jan Djärv <jan.h.d@swipnet.se> + + * xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used. + 2010-04-16 Ken Brown <kbrown@cornell.edu> (tiny change) * s/cygwin.h: Avoid linking against static libgcc. 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) if (XtIsShell (w)) /* popup menu */ { Widget *childs = NULL; - int num = 0; - XtVaGetValues (w, XtNnumChildren, &num, NULL); - if (num != 1) return; /* Should only be one. */ - - childs[0] = 0; XtVaGetValues (w, XtNchildren, &childs, NULL); - if (childs && *childs) w = *childs; + if (*childs) w = *childs; } /* Only use system font if the default is used for the menu. */ |