aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThien-Thi Nguyen2005-04-18 09:41:15 +0000
committerThien-Thi Nguyen2005-04-18 09:41:15 +0000
commit999cdb8fc7062b88e16d91f465c2e8beb964b431 (patch)
tree63d5c4f8479d8043f2110f1bb2560304be5f251c /src
parent59cfb104f6408ef3936c5f8e21de40ccd723169f (diff)
downloademacs-999cdb8fc7062b88e16d91f465c2e8beb964b431.tar.gz
emacs-999cdb8fc7062b88e16d91f465c2e8beb964b431.zip
(Fx_popup_menu): Initialize error_name to NULL.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xmenu.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2a253f1f8fc..a9ecedf1c53 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12005-04-18 Thien-Thi Nguyen <ttn@gnu.org>
2
3 * xmenu.c (Fx_popup_menu): Initialize error_name to NULL.
4
12005-04-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 52005-04-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 6
3 * macterm.c (XTread_socket): Don't beep on keyboard input even if 7 * macterm.c (XTread_socket): Don't beep on keyboard input even if
diff --git a/src/xmenu.c b/src/xmenu.c
index 63b2bf95f91..581a5ce6cd2 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -771,7 +771,7 @@ cached information about equivalent key sequences. */)
771 Lisp_Object keymap, tem; 771 Lisp_Object keymap, tem;
772 int xpos = 0, ypos = 0; 772 int xpos = 0, ypos = 0;
773 Lisp_Object title; 773 Lisp_Object title;
774 char *error_name; 774 char *error_name = NULL;
775 Lisp_Object selection; 775 Lisp_Object selection;
776 FRAME_PTR f = NULL; 776 FRAME_PTR f = NULL;
777 Lisp_Object x, y, window; 777 Lisp_Object x, y, window;