(mac_handle_visibility_change): Set buf.arg to Qnil.

(XTread_socket): Remove obsolete comment.

diff --git a/src/ChangeLog b/src/ChangeLog
index 78ce1234a32404e918170a352e359c7319bb338e..3999209f97e90d5e7a9a8e83fbfd1caa10a94340 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * macterm.c (mac_handle_visibility_change): Set buf.arg to Qnil.
+       (XTread_socket): Remove obsolete comment.
+
 2006-06-01  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xmenu.c (syms_of_xmenu): Make accelerate-menu an alias for

diff --git a/src/macterm.c b/src/macterm.c
index c86ad0ffde3fdb2d15cea9cc6de94f1acbc09cf1..0d166595773257f5e6d1ba5b7778ab09cafe582d 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -6134,6 +6134,7 @@ mac_handle_visibility_change (f)
          EVENT_INIT (buf);
          buf.kind = DEICONIFY_EVENT;
          XSETFRAME (buf.frame_or_window, f);
+         buf.arg = Qnil;
          kbd_buffer_store_event (&buf);
        }
       else if (! NILP (Vframe_list) && ! NILP (XCDR (Vframe_list)))
@@ -6147,6 +6148,7 @@ mac_handle_visibility_change (f)
        EVENT_INIT (buf);
        buf.kind = ICONIFY_EVENT;
        XSETFRAME (buf.frame_or_window, f);
+       buf.arg = Qnil;
        kbd_buffer_store_event (&buf);
       }
 
@@ -8338,9 +8340,10 @@ x_find_ccl_program (fontp)
 }
 
 #if USE_MAC_FONT_PANEL
-/* The first call to font panel functions (FPIsFontPanelVisible,
-   SetFontInfoForSelection) is slow.  This variable is used for
-   deferring such a call as much as possible.  */
+/* Whether Font Panel has been shown before.  The first call to font
+   panel functions (FPIsFontPanelVisible, SetFontInfoForSelection) is
+   slow.  This variable is used for deferring such a call as much as
+   possible.  */
 static int font_panel_shown_p = 0;
 
 int
@@ -9866,10 +9869,6 @@ XTread_socket (sd, expected, hold_quit)
       struct frame *f;
       unsigned long timestamp;
 
-      /* It is necessary to set this (additional) argument slot of an
-        event to nil because keyboard.c protects incompletely
-        processed event from being garbage collected by placing them
-        in the kbd_buffer_gcpro vector.  */
       EVENT_INIT (inev);
       inev.kind = NO_EVENT;
       inev.arg = Qnil;