(Fset_char_table_parent): Doc fix.

[bpt/emacs.git] / src / macterm.c

diff --git a/src/macterm.c b/src/macterm.c
index d00c1d6..f0f5a3f 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -6240,6 +6240,7 @@ x_load_font (f, fontname, size)
 
     /* Now fill in the slots of *FONTP.  */
     BLOCK_INPUT;
+    bzero (fontp, sizeof (*fontp));
     fontp->font = font;
     fontp->font_idx = i;
     fontp->name = (char *) xmalloc (strlen (font->fontname) + 1);
@@ -7772,14 +7773,15 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
          switch (part_code)
            {
            case inMenuBar:
-              {
-                struct frame *f = ((mac_output *)
-                                  GetWRefCon (FrontWindow ()))->mFP;
-                saved_menu_event_location = er.where;
-                bufp->kind = MENU_BAR_ACTIVATE_EVENT;
-                XSETFRAME (bufp->frame_or_window, f);
-                count++;
-              }
+             if (er.what == mouseDown)  
+               {
+                 struct frame *f = ((mac_output *)
+                                    GetWRefCon (FrontWindow ()))->mFP;
+                 saved_menu_event_location = er.where;
+                 bufp->kind = MENU_BAR_ACTIVATE_EVENT;
+                 XSETFRAME (bufp->frame_or_window, f);
+                 count++;
+               }
              break;
 
            case inContent:
@@ -7874,12 +7876,13 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
 
            case inDrag:
 #if TARGET_API_MAC_CARBON
-             {
-               BitMap bm;
-
-               GetQDGlobalsScreenBits (&bm);
-               DragWindow (window_ptr, er.where, &bm.bounds);
-             }
+              if (er.what == mouseDown)  
+               {
+                 BitMap bm;
+                 
+                 GetQDGlobalsScreenBits (&bm);
+                 DragWindow (window_ptr, er.where, &bm.bounds);
+               }
 #else /* not TARGET_API_MAC_CARBON */
              DragWindow (window_ptr, er.where, &qd.screenBits.bounds);
 #endif /* not TARGET_API_MAC_CARBON */
@@ -7897,8 +7900,11 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
 
            /* window resize handling added --ben */
            case inGrow:
-             do_grow_window(window_ptr, &er);
-             break;
+              if (er.what == mouseDown)  
+               {
+                 do_grow_window(window_ptr, &er);
+                 break;
+               }
 
            /* window zoom handling added --ben */
            case inZoomIn:
@@ -8827,3 +8833,6 @@ command, this enables the Mac keyboard to be used to enter non-ASCII
 characters directly.  */);
   mac_keyboard_text_encoding = kTextEncodingMacRoman;
 }
+
+/* arch-tag: f2259165-4454-4c04-a029-a133c8af7b5b
+   (do not change this comment) */