diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1999-05-08 20:29:05 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1999-05-08 20:29:05 +0000 |
| commit | 8c95f4f8701e20bcf4f2aae69d754eacd843863a (patch) | |
| tree | b355b83f3d9277f0a7cf78837d36a3eb50282aaf /lib/libmenu | |
| parent | 0084ba11e5e602ab257ba70015fbc2e4b3d8ce98 (diff) | |
ncurses-4.2-990424
Diffstat (limited to 'lib/libmenu')
| -rw-r--r-- | lib/libmenu/m_item_new.c | 7 | ||||
| -rw-r--r-- | lib/libmenu/m_item_opt.c | 4 | ||||
| -rw-r--r-- | lib/libmenu/m_new.c | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/libmenu/m_item_new.c b/lib/libmenu/m_item_new.c index 0589f31582a..03337b8720a 100644 --- a/lib/libmenu/m_item_new.c +++ b/lib/libmenu/m_item_new.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_item_new.c,v 1.4 1998/07/24 16:39:01 millert Exp $ */ +/* $OpenBSD: m_item_new.c,v 1.5 1999/05/08 20:29:03 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -40,7 +40,7 @@ #include "menu.priv.h" -MODULE_ID("$From: m_item_new.c,v 1.8 1998/02/11 12:13:50 tom Exp $") +MODULE_ID("$From: m_item_new.c,v 1.9 1999/03/28 18:10:24 juergen Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -180,7 +180,8 @@ int set_menu_mark(MENU * menu, const char * mark) if (menu->mark) { strcpy(menu->mark, mark); - menu->status |= _MARK_ALLOCATED; + if (menu != &_nc_Default_Menu) + menu->status |= _MARK_ALLOCATED; } else { diff --git a/lib/libmenu/m_item_opt.c b/lib/libmenu/m_item_opt.c index 8dce6114bf4..367eab91bd2 100644 --- a/lib/libmenu/m_item_opt.c +++ b/lib/libmenu/m_item_opt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_item_opt.c,v 1.5 1999/02/24 06:37:12 millert Exp $ */ +/* $OpenBSD: m_item_opt.c,v 1.6 1999/05/08 20:29:03 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -101,7 +101,7 @@ int item_opts_off(ITEM *item, Item_Options opts) RETURN(E_BAD_ARGUMENT); else { - Normalize_Item(citem); + Normalize_Item(citem); opts = citem->opt & ~(opts & ALL_ITEM_OPTS); return set_item_opts( item, opts ); } diff --git a/lib/libmenu/m_new.c b/lib/libmenu/m_new.c index 001b6855a23..b808247d3f5 100644 --- a/lib/libmenu/m_new.c +++ b/lib/libmenu/m_new.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_new.c,v 1.4 1998/07/24 16:39:09 millert Exp $ */ +/* $OpenBSD: m_new.c,v 1.5 1999/05/08 20:29:04 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -39,7 +39,7 @@ #include "menu.priv.h" -MODULE_ID("$From: m_new.c,v 1.7 1998/02/11 12:13:49 tom Exp $") +MODULE_ID("$From: m_new.c,v 1.8 1999/03/28 18:10:31 juergen Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -59,6 +59,7 @@ MENU *new_menu(ITEM ** items) if (menu) { *menu = _nc_Default_Menu; + menu->status = 0; menu->rows = menu->frows; menu->cols = menu->fcols; if (items && *items) |