(Fset_window_margins): Allow only integers as args.

[gnu-emacs] / src / macterm.c

diff --git a/src/macterm.c b/src/macterm.c
index 8c22d047939256bdd65b456c51faa9a56003d45f..6fe2bc1603c4f7642afb8cf131526f16f1f9bae4 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);
@@ -7874,12 +7875,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 */