diff options
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 723de57fc5d..f68f3a41e3f 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -82,7 +82,11 @@ Boston, MA 02110-1301, USA. */ #include <X11/StringDefs.h> #include <X11/Shell.h> #ifdef USE_LUCID +#ifdef HAVE_XAW3D +#include <X11/Xaw3d/Paned.h> +#else /* !HAVE_XAW3D */ #include <X11/Xaw/Paned.h> +#endif /* HAVE_XAW3D */ #endif /* USE_LUCID */ #include "../lwlib/lwlib.h" #else /* not USE_X_TOOLKIT */ @@ -325,7 +329,7 @@ restore_menu_items (saved) menu_items_used = XINT (XCAR (saved)); saved = XCDR (saved); menu_items_n_panes = XINT (XCAR (saved)); - saved = XCDR (saved); + saved = XCDR (saved); menu_items_submenu_depth = XINT (XCAR (saved)); return Qnil; } @@ -3428,7 +3432,7 @@ menu_help_callback (help_string, pane, item) pane_name = first_item[MENU_ITEMS_PANE_NAME]; else if (EQ (first_item[0], Qquote)) /* This shouldn't happen, see xmenu_show. */ - pane_name = empty_string; + pane_name = empty_unibyte_string; else pane_name = first_item[MENU_ITEMS_ITEM_NAME]; |