aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2001-10-30 03:38:24 +0000
committerStefan Monnier2001-10-30 03:38:24 +0000
commitb2123f814237f1fb529c3ebfed6ba40f790e08b9 (patch)
tree8f9ce1174912e236caead0df0fda96e9697cf7bc
parent3ebb84168d40aa6f312ed1ee78a479a0c895fb45 (diff)
downloademacs-b2123f814237f1fb529c3ebfed6ba40f790e08b9.tar.gz
emacs-b2123f814237f1fb529c3ebfed6ba40f790e08b9.zip
(Fx_popup_menu): Explicitly init f, xpos, and ypos.
(Fx_popup_dialog): Explicitly init f. (w32_menu_display_help): Use empty_string.
-rw-r--r--src/w32menu.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32menu.c b/src/w32menu.c
index 74d4f2754b4..1dd1ed63804 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -620,11 +620,11 @@ cached information about equivalent key sequences.")
620 Lisp_Object position, menu; 620 Lisp_Object position, menu;
621{ 621{
622 Lisp_Object keymap, tem; 622 Lisp_Object keymap, tem;
623 int xpos, ypos; 623 int xpos = 0, ypos = 0;
624 Lisp_Object title; 624 Lisp_Object title;
625 char *error_name; 625 char *error_name;
626 Lisp_Object selection; 626 Lisp_Object selection;
627 FRAME_PTR f; 627 FRAME_PTR f = NULL;
628 Lisp_Object x, y, window; 628 Lisp_Object x, y, window;
629 int keymaps = 0; 629 int keymaps = 0;
630 int for_click = 0; 630 int for_click = 0;
@@ -825,7 +825,7 @@ on the left of the dialog box and all following items on the right.\n\
825 (position, contents) 825 (position, contents)
826 Lisp_Object position, contents; 826 Lisp_Object position, contents;
827{ 827{
828 FRAME_PTR f; 828 FRAME_PTR f = NULL;
829 Lisp_Object window; 829 Lisp_Object window;
830 830
831 check_w32 (); 831 check_w32 ();
@@ -2201,7 +2201,7 @@ w32_menu_display_help (HMENU menu, UINT item, UINT flags)
2201 pane_name = first_item[MENU_ITEMS_PANE_NAME]; 2201 pane_name = first_item[MENU_ITEMS_PANE_NAME];
2202 else if (EQ (first_item[0], Qquote)) 2202 else if (EQ (first_item[0], Qquote))
2203 /* This shouldn't happen, see w32_menu_show. */ 2203 /* This shouldn't happen, see w32_menu_show. */
2204 pane_name = build_string (""); 2204 pane_name = empty_string;
2205 else 2205 else
2206 pane_name = first_item[MENU_ITEMS_ITEM_NAME]; 2206 pane_name = first_item[MENU_ITEMS_ITEM_NAME];
2207 2207