aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2002-01-06 23:35:05 +0000
committerJason Rumney2002-01-06 23:35:05 +0000
commit0b1e6b549bf36860245f074737c05390c65b45bb (patch)
tree949953948e2bdad424fbaf256167ff62bafee75c /src
parent7f2cddf33be85221b681f85ba4cc51bf10d24a9d (diff)
downloademacs-0b1e6b549bf36860245f074737c05390c65b45bb.tar.gz
emacs-0b1e6b549bf36860245f074737c05390c65b45bb.zip
(single_submenu): Initialize wv->help to Qnil.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xmenu.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ef7a06de3c9..cb65129f107 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12002-01-06 Jason Rumney <jasonr@gnu.org> 12002-01-06 Jason Rumney <jasonr@gnu.org>
2 2
3 * xmenu.c (single_submenu): Initialize wv->help to Qnil.
4
3 * w32menu.c (w32_menu_display_help): Revert last change. 5 * w32menu.c (w32_menu_display_help): Revert last change.
4 6
5 * xmenu.c (menu_highlight_callback): Revert last change. 7 * xmenu.c (menu_highlight_callback): Revert last change.
diff --git a/src/xmenu.c b/src/xmenu.c
index 3df3cab9be4..06b0f9f77ea 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1404,6 +1404,7 @@ single_submenu (item_key, item_name, maps)
1404 wv->value = 0; 1404 wv->value = 0;
1405 wv->enabled = 1; 1405 wv->enabled = 1;
1406 wv->button_type = BUTTON_TYPE_NONE; 1406 wv->button_type = BUTTON_TYPE_NONE;
1407 wv->help = Qnil;
1407 first_wv = wv; 1408 first_wv = wv;
1408 save_wv = 0; 1409 save_wv = 0;
1409 prev_wv = 0; 1410 prev_wv = 0;
@@ -1476,6 +1477,7 @@ single_submenu (item_key, item_name, maps)
1476 wv->value = 0; 1477 wv->value = 0;
1477 wv->enabled = 1; 1478 wv->enabled = 1;
1478 wv->button_type = BUTTON_TYPE_NONE; 1479 wv->button_type = BUTTON_TYPE_NONE;
1480 wv->help = Qnil;
1479 } 1481 }
1480 save_wv = wv; 1482 save_wv = wv;
1481 prev_wv = 0; 1483 prev_wv = 0;