Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-593
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-594
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-595
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-596
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-597
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-598
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-599
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-600
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-601
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-602
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-603
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-42
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-43
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-44
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-253

12 files changed, 341 insertions, 188 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 3af7e369923..b7716f0e904 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -60,6 +60,16 @@ Print the emacs s-expression which is $.
 Works only when an inferior emacs is executing.
 end
 
+# Print out s-expressions
+define pp
+  set $tmp = $arg0
+  set debug_print ($tmp)
+end
+document pp
+Print the argument as an emacs s-expression
+Works only when an inferior emacs is executing.
+end
+
 define xtype
   xgettype $
   output $type
@@ -429,6 +439,16 @@ document xreload
 end
 xreload
 
+# Flush display (X only)
+define ff
+  set x_flush (0)
+end
+document ff
+Flush pending X window display updates to screen.
+Works only when an inferior emacs is executing.
+end
+
+
 define hook-run
   xreload
 end
diff --git a/src/ChangeLog b/src/ChangeLog
index 73fb09883eb..99be23b4df8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,72 @@
+2004-10-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (mac_get_window_bounds): Add extern.
+        (x_real_positions): Use mac_get_window_bounds.
+
+        * macmenu.c (update_submenu_strings): Apply 2004-09-07 change for
+        xmenu.c (YAILOM).
+        
+        * macterm.c [!MAC_OSX]: Include Windows.h.
+        (front_emacs_window): Rename from mac_front_window.  All uses
+        changed.  Return the frontmost non-tooltip emacs window.
+        (mac_get_window_bounds): New function.
+        (x_calc_absolute_position): Use the difference of width and height
+        between the inner and outer window.
+        (x_set_offset): Specify window position by the coordinae of the
+        outer window.  Adjust the position if the title bar is completely
+        outside the screen.
+        (app_is_suspended, app_sleep_time): Remove unused variables.
+        (do_app_resume, do_app_suspend): Remove their contents because
+        window-activate/deactivate events will do the job.
+        (do_zoom_window): Remove unused variables.  Make compliant to the
+        standard way of zooming.  Set f->left_pos and f->top_pos.
+        (XTread_socket): Don't use argument `expected'.  Don't use
+        FrontWindow to determine the clicked window.  Exclude unprocessed
+        mouseUp cases in the early stage.  Add parentheses to fix operator
+        precedence.
+        (XTread_socket) [TARGET_API_MAC_CARBON]: Don't specify drag area.
+
+
+2004-10-05  Jan Dj,Ad(Brv.  <jan.h.d@swipnet.se>
+
+        * config.in: Regenerate.
+
+        * Makefile.in (RUN_TEMACS): Check HAVE_RANDOM_HEAPSTART instead of
+        HAVE_EXECSHIELD.
+
+2004-10-05  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_find_modifier_meanings): Ignore any Super or Hyper for
+        a row if Alt or Meta has been found for that row.  Also stop scanning
+        for Keysyms for that row.
+
+2004-10-04  Kim F. Storm  <storm@cua.dk>
+
+        * fringe.c (Ffringe_bitmaps_at_pos): Change return value from cons
+        to list.  Include overlay arrow bitmap in return value.
+
+        * xterm.c (XTset_vertical_scroll_bar): Improve handling of scroll
+        bars with fractional column width.  If scroll bar separates two
+        windows, move it towards the window it belongs to.  Only update
+        the padding area below the scroll bar widget when necessary,
+        i.e. when scroll bar widget is created, moved, or resized.
+
+        * xdisp.c (define_frame_cursor1): Do not change frame cursor
+        while tracking/dragging mouse.
+        (x_draw_vertical_border): Do not draw line if frame has scroll bars.
+
+        * window.c (coordinates_in_window): Relax check for cursor
+        on vertial border between mode lines.
+        (Fset_window_fringes): Do not allow negative widths.
+        (Fset_window_scroll_bars): Likewise.
+
+        * .gdbinit (pp): Shorthand for p ARG + pr.
+        (ff): New command: flush frame updates (X only).
+
+2004-10-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * fileio.c (auto_save_1) Call Ffile_modes for remote files.
+
 2004-09-30  Kenichi Handa  <handa@m17n.org>
 
         * process.c (send_process): Free composition data.
diff --git a/src/Makefile.in b/src/Makefile.in
index dc8964a42ca..f85811c970a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -909,7 +909,7 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) \
 #define OBJECTS_MACHINE
 #endif
 
-#ifdef HAVE_EXECSHIELD
+#ifdef HAVE_RANDOM_HEAPSTART
 #undef i386
 RUN_TEMACS = @SETARCH@ i386 ./temacs
 #else
diff --git a/src/config.in b/src/config.in
index e5d112ee81c..6e6d61b4e02 100644
--- a/src/config.in
+++ b/src/config.in
@@ -136,9 +136,6 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `euidaccess' function. */
 #undef HAVE_EUIDACCESS
 
-/* Define to 1 if this OS has exec shield and we can handle it. */
-#undef HAVE_EXECSHIELD
-
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
@@ -432,6 +429,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `random' function. */
 #undef HAVE_RANDOM
 
+/* Define to 1 if this OS randomizes the start address of the heap. */
+#undef HAVE_RANDOM_HEAPSTART
+
 /* Define to 1 if you have the `recvfrom' function. */
 #undef HAVE_RECVFROM
 
diff --git a/src/fileio.c b/src/fileio.c
index 0cfea99b469..ece909ea8b3 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5720,6 +5720,9 @@ auto_save_1 ()
       && stat (SDATA (current_buffer->filename), &st) >= 0)
     /* But make sure we can overwrite it later!  */
     auto_save_mode_bits = st.st_mode | 0600;
+  else if (! NILP (current_buffer->filename))
+    /* Remote files don't cooperate with stat.  */
+    auto_save_mode_bits = XINT (Ffile_modes (current_buffer->filename)) | 0600;
   else
     auto_save_mode_bits = 0666;
 
diff --git a/src/fringe.c b/src/fringe.c
index 529004c7ed8..2da5439b039 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1348,9 +1348,10 @@ DEFUN ("fringe-bitmaps-at-pos", Ffringe_bitmaps_at_pos, Sfringe_bitmaps_at_pos,
        0, 2, 0,
        doc: /* Return fringe bitmaps of row containing position POS in window WINDOW.
 If WINDOW is nil, use selected window.  If POS is nil, use value of point
-in that window.  Return value is a cons (LEFT . RIGHT) where LEFT and RIGHT
-are the fringe bitmap numbers for the bitmaps in the left and right fringe,
-resp.  If left or right fringe is empty, the corresponding element is nil.
+in that window.  Return value is a list (LEFT RIGHT OV), where LEFT
+is the symbol for the bitmap in the left fringe (or nil if no bitmap),
+RIGHT is similar for the right fringe, and OV is non-nil if there is an
+overlay arrow in the left fringe.
 Return nil if POS is not visible in WINDOW.  */)
   (pos, window)
      Lisp_Object pos, window;
@@ -1377,8 +1378,9 @@ Return nil if POS is not visible in WINDOW.  */)
   row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
   row = row_containing_pos (w, textpos, row, NULL, 0);
   if (row)
-    return Fcons (get_fringe_bitmap_name (row->left_fringe_bitmap),
-                  get_fringe_bitmap_name (row->right_fringe_bitmap));
+    return list3 (get_fringe_bitmap_name (row->left_fringe_bitmap),
+                  get_fringe_bitmap_name (row->right_fringe_bitmap),
+                  (row->overlay_arrow_p ? Qt : Qnil));
   else
     return Qnil;
 }
diff --git a/src/macfns.c b/src/macfns.c
index 3b09b344a55..f7594e9c6c2 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -312,6 +312,9 @@ static Lisp_Object x_default_scroll_bar_color_parameter P_ ((struct frame *,
                                                              Lisp_Object,
                                                              char *, char *,
                                                              int));
+
+extern void mac_get_window_bounds P_ ((struct frame *, Rect *, Rect *));
+
 /* Store the screen positions of frame F into XPTR and YPTR.
    These are the positions of the containing window manager window,
    not Emacs's own window.  */
@@ -321,33 +324,15 @@ x_real_positions (f, xptr, yptr)
      FRAME_PTR f;
      int *xptr, *yptr;
 {
-  Point pt;
-  GrafPtr oldport;
+  Rect inner, outer;
 
-  GetPort (&oldport);
-  SetPortWindowPort (FRAME_MAC_WINDOW (f));
+  mac_get_window_bounds (f, &inner, &outer);
 
-#if TARGET_API_MAC_CARBON
-  {
-    Rect r;
+  f->x_pixels_diff = inner.left - outer.left;
+  f->y_pixels_diff = inner.top - outer.top;
 
-    GetWindowPortBounds (FRAME_MAC_WINDOW (f), &r);
-    SetPt (&pt, r.left, r.top);
-  }
-#else /* not TARGET_API_MAC_CARBON */
-  SetPt (&pt,
-         FRAME_MAC_WINDOW (f)->portRect.left,
-         FRAME_MAC_WINDOW (f)->portRect.top);
-#endif /* not TARGET_API_MAC_CARBON */
-  LocalToGlobal (&pt);
-  SetPort (oldport);
-
-  /* MAC has no frame pixel diff.  */
-  f->x_pixels_diff = 0;
-  f->y_pixels_diff = 0;
-
-  *xptr = pt.h;
-  *yptr = pt.v;
+  *xptr = outer.left;
+  *yptr = outer.top;
 }
 
 
diff --git a/src/macmenu.c b/src/macmenu.c
index 740bda261d8..007fab15eab 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -1322,7 +1322,7 @@ update_submenu_strings (first_wv)
 
   for (wv = first_wv; wv; wv = wv->next)
     {
-      if (wv->lname && ! NILP (wv->lname))
+      if (STRINGP (wv->lname))
         {
           wv->name = SDATA (wv->lname);
 
@@ -1336,7 +1336,7 @@ update_submenu_strings (first_wv)
             }
         }
 
-      if (wv->lkey && ! NILP (wv->lkey))
+      if (STRINGP (wv->lkey))
         wv->key = SDATA (wv->lkey);
 
       if (wv->contents)
diff --git a/src/macterm.c b/src/macterm.c
index 4f721fff304..56c4653bf43 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -50,6 +50,7 @@ Boston, MA 02111-1307, USA.  */
 #include <TextUtils.h>
 #include <LowMem.h>
 #include <Controls.h>
+#include <Windows.h>
 #if defined (__MRC__) || (__MSL__ >= 0x6000)
 #include <ControlDefinitions.h>
 #endif
@@ -3887,18 +3888,21 @@ remember_mouse_glyph (f1, gx, gy)
 
 
 static WindowPtr
-mac_front_window ()
+front_emacs_window ()
 {
 #if TARGET_API_MAC_CARBON
-  return GetFrontWindowOfClass (kDocumentWindowClass, true);
+  WindowPtr wp = GetFrontWindowOfClass (kDocumentWindowClass, true);
+
+  while (wp && !is_emacs_window (wp))
+    wp = GetNextWindowOfClass (wp, kDocumentWindowClass, true);
 #else
-  WindowPtr front_window = FrontWindow ();
+  WindowPtr wp = FrontWindow ();
 
-  if (tip_window && front_window == tip_window)
-    return GetNextWindow (front_window);
-  else
-    return front_window;
+  while (wp && (wp == tip_window || !is_emacs_window (wp)))
+    wp = GetNextWindow (wp);
 #endif
+
+  return wp;
 }
 
 #define mac_window_to_frame(wp) (((mac_output *) GetWRefCon (wp))->mFP)
@@ -3934,7 +3938,7 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time)
 {
   Point mouse_pos;
   int ignore1, ignore2;
-  WindowPtr wp = mac_front_window ();
+  WindowPtr wp = front_emacs_window ();
   struct frame *f;
   Lisp_Object frame, tail;
 
@@ -4551,7 +4555,7 @@ x_scroll_bar_report_motion (fp, bar_window, part, x, y, time)
      unsigned long *time;
 {
   struct scroll_bar *bar = XSCROLL_BAR (last_mouse_scroll_bar);
-  WindowPtr wp = mac_front_window ();
+  WindowPtr wp = front_emacs_window ();
   Point mouse_pos;
   struct frame *f = mac_window_to_frame (wp);
   int win_y, top_range;
@@ -5036,6 +5040,26 @@ xim_close_dpy (dpyinfo)
  */
 
 
+void
+mac_get_window_bounds (f, inner, outer)
+     struct frame *f;
+     Rect *inner, *outer;
+{
+#if TARGET_API_MAC_CARBON
+  GetWindowBounds (FRAME_MAC_WINDOW (f), kWindowContentRgn, inner);
+  GetWindowBounds (FRAME_MAC_WINDOW (f), kWindowStructureRgn, outer);
+#else /* not TARGET_API_MAC_CARBON */
+  RgnHandle region = NewRgn ();
+    
+  GetWindowRegion (FRAME_MAC_WINDOW (f), kWindowContentRgn, region);
+  *inner = (*region)->rgnBBox;
+  GetWindowRegion (FRAME_MAC_WINDOW (f), kWindowStructureRgn, region);
+  *outer = (*region)->rgnBBox;
+  DisposeRgn (region);
+#endif /* not TARGET_API_MAC_CARBON */
+}
+
+
 /* Calculate the absolute position in frame F
    from its current recorded position values and gravity.  */
 
@@ -5043,47 +5067,36 @@ void
 x_calc_absolute_position (f)
      struct frame *f;
 {
-  Point pt;
+  int width_diff = 0, height_diff = 0;
   int flags = f->size_hint_flags;
+  Rect inner, outer;
 
-  pt.h = pt.v = 0;
+  /* We have nothing to do if the current position
+     is already for the top-left corner.  */
+  if (! ((flags & XNegative) || (flags & YNegative)))
+    return;
 
-  /* Find the position of the outside upper-left corner of
+  /* Find the offsets of the outside upper-left corner of
      the inner window, with respect to the outer window.  */
-  if (f->output_data.mac->parent_desc != FRAME_MAC_DISPLAY_INFO (f)->root_window)
-    {
-      GrafPtr savePort;
-      GetPort (&savePort);
-
-      SetPortWindowPort (FRAME_MAC_WINDOW (f));
+  mac_get_window_bounds (f, &inner, &outer);
 
-#if TARGET_API_MAC_CARBON
-      {
-        Rect r;
-
-        GetWindowPortBounds (FRAME_MAC_WINDOW (f), &r);
-        SetPt(&pt, r.left,  r.top);
-      }
-#else /* not TARGET_API_MAC_CARBON */
-      SetPt(&pt, FRAME_MAC_WINDOW (f)->portRect.left,  FRAME_MAC_WINDOW (f)->portRect.top);
-#endif /* not TARGET_API_MAC_CARBON */
-      LocalToGlobal (&pt);
-      SetPort (savePort);
-    }
+  width_diff = (outer.right - outer.left) - (inner.right - inner.left);
+  height_diff = (outer.bottom - outer.top) - (inner.bottom - inner.top);
 
   /* Treat negative positions as relative to the leftmost bottommost
      position that fits on the screen.  */
   if (flags & XNegative)
     f->left_pos = (FRAME_MAC_DISPLAY_INFO (f)->width
-                   - 2 * f->border_width - pt.h
+                   - width_diff
                    - FRAME_PIXEL_WIDTH (f)
                    + f->left_pos);
-  /* NTEMACS_TODO: Subtract menubar height?  */
+
   if (flags & YNegative)
     f->top_pos = (FRAME_MAC_DISPLAY_INFO (f)->height
-                  - 2 * f->border_width - pt.v
+                  - height_diff
                   - FRAME_PIXEL_HEIGHT (f)
                   + f->top_pos);
+
   /* The left_pos and top_pos
      are now relative to the top and left screen edges,
      so the flags should correspond.  */
@@ -5102,8 +5115,6 @@ x_set_offset (f, xoff, yoff, change_gravity)
      register int xoff, yoff;
      int change_gravity;
 {
-  int modified_top, modified_left;
-
   if (change_gravity > 0)
     {
       f->top_pos = yoff;
@@ -5120,11 +5131,55 @@ x_set_offset (f, xoff, yoff, change_gravity)
   BLOCK_INPUT;
   x_wm_set_size_hint (f, (long) 0, 0);
 
-  modified_left = f->left_pos;
-  modified_top = f->top_pos;
-
-  MoveWindow (FRAME_MAC_WINDOW (f), modified_left + 6,
-              modified_top + 42, false);
+#if TARGET_API_MAC_CARBON
+  MoveWindowStructure (FRAME_MAC_WINDOW (f), f->left_pos, f->top_pos);
+  /* If the title bar is completely outside the screen, adjust the
+     position. */
+  ConstrainWindowToScreen (FRAME_MAC_WINDOW (f), kWindowTitleBarRgn,
+                           kWindowConstrainMoveRegardlessOfFit
+                           | kWindowConstrainAllowPartial, NULL, NULL);
+  x_real_positions (f, &f->left_pos, &f->top_pos);
+#else
+  {
+    Rect inner, outer, screen_rect, dummy;
+    RgnHandle region = NewRgn ();
+    
+    mac_get_window_bounds (f, &inner, &outer);
+    f->x_pixels_diff = inner.left - outer.left;
+    f->y_pixels_diff = inner.top - outer.top;
+    MoveWindow (FRAME_MAC_WINDOW (f), f->left_pos + f->x_pixels_diff,
+                f->top_pos + f->y_pixels_diff, false);
+
+    /* If the title bar is completely outside the screen, adjust the
+       position.  The variable `outer' holds the title bar rectangle.
+       The variable `inner' holds slightly smaller one than `outer',
+       so that the calculation of overlapping may not become too
+       strict.  */
+    GetWindowRegion (FRAME_MAC_WINDOW (f), kWindowTitleBarRgn, region);
+    outer = (*region)->rgnBBox;
+    DisposeRgn (region);
+    inner = outer;
+    InsetRect (&inner, 8, 8);
+    screen_rect = qd.screenBits.bounds;
+    screen_rect.top += GetMBarHeight ();
+
+    if (!SectRect (&inner, &screen_rect, &dummy))
+      {
+        if (inner.right <= screen_rect.left)
+          f->left_pos = screen_rect.left;
+        else if (inner.left >= screen_rect.right)
+          f->left_pos = screen_rect.right - (outer.right - outer.left);
+
+        if (inner.bottom <= screen_rect.top)
+          f->top_pos = screen_rect.top;
+        else if (inner.top >= screen_rect.bottom)
+          f->top_pos = screen_rect.bottom - (outer.bottom - outer.top);
+
+        MoveWindow (FRAME_MAC_WINDOW (f), f->left_pos + f->x_pixels_diff,
+                    f->top_pos + f->y_pixels_diff, false);
+      }
+  }
+#endif
 
   UNBLOCK_INPUT;
 }
@@ -6900,6 +6955,7 @@ x_find_ccl_program (fontp)
 /* true when cannot handle any Mac OS events */
 static int handling_window_update = 0;
 
+#if 0
 /* the flag appl_is_suspended is used both for determining the sleep
    time to be passed to WaitNextEvent and whether the cursor should be
    drawn when updating the display.  The cursor is turned off when
@@ -6909,6 +6965,7 @@ static int handling_window_update = 0;
    suspended.  */
 static Boolean app_is_suspended = false;
 static long app_sleep_time = WNE_SLEEP_AT_RESUME;
+#endif
 
 #define EXTRA_STACK_ALLOC (256 * 1024)
 
@@ -7235,11 +7292,13 @@ is_emacs_window (WindowPtr win)
 static void
 do_app_resume ()
 {
+  /* Window-activate events will do the job. */
+#if 0
   WindowPtr wp;
   struct frame *f;
 
-  wp = mac_front_window ();
-  if (is_emacs_window (wp))
+  wp = front_emacs_window ();
+  if (wp)
     {
       f = mac_window_to_frame (wp);
 
@@ -7252,16 +7311,19 @@ do_app_resume ()
 
   app_is_suspended = false;
   app_sleep_time = WNE_SLEEP_AT_RESUME;
+#endif
 }
 
 static void
 do_app_suspend ()
 {
+  /* Window-deactivate events will do the job. */
+#if 0
   WindowPtr wp;
   struct frame *f;
 
-  wp = mac_front_window ();
-  if (is_emacs_window (wp))
+  wp = front_emacs_window ();
+  if (wp)
     {
       f = mac_window_to_frame (wp);
 
@@ -7274,6 +7336,7 @@ do_app_suspend ()
 
   app_is_suspended = true;
   app_sleep_time = WNE_SLEEP_AT_SUSPEND;
+#endif
 }
 
 
@@ -7282,10 +7345,10 @@ do_mouse_moved (mouse_pos, f)
      Point mouse_pos;
      FRAME_PTR *f;
 {
-  WindowPtr wp = mac_front_window ();
+  WindowPtr wp = front_emacs_window ();
   struct x_display_info *dpyinfo;
 
-  if (is_emacs_window (wp))
+  if (wp)
     {
       *f = mac_window_to_frame (wp);
       dpyinfo = FRAME_MAC_DISPLAY_INFO (*f);
@@ -7347,7 +7410,7 @@ do_menu_choice (SInt32 menu_choice)
 
     default:
       {
-        struct frame *f = mac_window_to_frame (mac_front_window ());
+        struct frame *f = mac_window_to_frame (front_emacs_window ());
         MenuHandle menu = GetMenuHandle (menu_id);
         if (menu)
           {
@@ -7400,41 +7463,43 @@ do_zoom_window (WindowPtr w, int zoom_in_or_out)
   GrafPtr save_port;
   Rect zoom_rect, port_rect;
   Point top_left;
-  int w_title_height, columns, rows, width, height, dummy, x, y;
+  int w_title_height, columns, rows;
   struct frame *f = mac_window_to_frame (w);
 
-  GetPort (&save_port);
-
-  SetPortWindowPort (w);
-
-  /* Clear window to avoid flicker.  */
 #if TARGET_API_MAC_CARBON
   {
-    Rect r;
-    BitMap bm;
+    Point standard_size;
 
-    GetWindowPortBounds (w, &r);
-    EraseRect (&r);
+    standard_size.h = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, DEFAULT_NUM_COLS);
+    standard_size.v = FRAME_MAC_DISPLAY_INFO (f)->height;
 
-    if (zoom_in_or_out == inZoomOut)
+    if (IsWindowInStandardState (w, &standard_size, &zoom_rect))
+      zoom_in_or_out = inZoomIn;
+    else
       {
-        /* calculate height of window's title bar (hard card it for now).  */
-        w_title_height = 20 + GetMBarHeight ();
-
-        /* get maximum height of window into zoom_rect.bottom -
-           zoom_rect.top */
-        GetQDGlobalsScreenBits (&bm);
-        zoom_rect = bm.bounds;
-        zoom_rect.top += w_title_height;
-        InsetRect (&zoom_rect, 8, 4);  /* not too tight */
-
-        zoom_rect.right = zoom_rect.left
-          + FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, DEFAULT_NUM_COLS);
-
-        SetWindowStandardState (w, &zoom_rect);
+        /* Adjust the standard size according to character boundaries.  */
+
+        columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, zoom_rect.right - zoom_rect.left);
+        rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, zoom_rect.bottom - zoom_rect.top);
+        standard_size.h = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, columns);
+        standard_size.v = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
+        GetWindowBounds (w, kWindowContentRgn, &port_rect);
+        if (IsWindowInStandardState (w, &standard_size, &zoom_rect)
+            && port_rect.left == zoom_rect.left
+            && port_rect.top == zoom_rect.top)
+          zoom_in_or_out = inZoomIn;
+        else
+          zoom_in_or_out = inZoomOut;
       }
+
+    ZoomWindowIdeal (w, zoom_in_or_out, &standard_size);
   }
 #else /* not TARGET_API_MAC_CARBON */
+  GetPort (&save_port);
+
+  SetPortWindowPort (w);
+
+  /* Clear window to avoid flicker.  */
   EraseRect (&(w->portRect));
   if (zoom_in_or_out == inZoomOut)
     {
@@ -7453,12 +7518,19 @@ do_zoom_window (WindowPtr w, int zoom_in_or_out)
       zoom_rect.right = zoom_rect.left
         + FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, DEFAULT_NUM_COLS);
 
+      /* Adjust the standard size according to character boundaries.  */
+      rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, zoom_rect.bottom - zoom_rect.top);
+      zoom_rect.bottom =
+        zoom_rect.top + FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
+
       (**((WStateDataHandle) ((WindowPeek) w)->dataHandle)).stdState
         = zoom_rect;
     }
-#endif /* not TARGET_API_MAC_CARBON */
 
-  ZoomWindow (w, zoom_in_or_out, w == mac_front_window ());
+  ZoomWindow (w, zoom_in_or_out, w == front_emacs_window ());
+
+  SetPort (save_port);
+#endif /* not TARGET_API_MAC_CARBON */
 
   /* retrieve window size and update application values */
 #if TARGET_API_MAC_CARBON
@@ -7469,8 +7541,7 @@ do_zoom_window (WindowPtr w, int zoom_in_or_out)
   rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, port_rect.bottom - port_rect.top);
   columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, port_rect.right - port_rect.left);
   x_set_window_size (f, 0, columns, rows);
-
-  SetPort (save_port);
+  x_real_positions (f, &f->left_pos, &f->top_pos);
 }
 
 /* Initialize Drag And Drop to allow files to be dropped onto emacs frames */
@@ -8020,19 +8091,15 @@ XTread_socket (sd, expected, hold_quit)
   if (NILP (Fboundp (Qmac_ready_for_drag_n_drop)))
     event_mask -= highLevelEventMask;
 
-  while (WaitNextEvent (event_mask, &er,
-                        (expected ? app_sleep_time : 0L), NULL))
-#else
-  while (!ReceiveNextEvent (0, NULL,
-                            (expected ? TicksToEventTime (app_sleep_time) : 0),
+  while (WaitNextEvent (event_mask, &er, 0L, NULL))
+#else /* USE_CARBON_EVENTS */
+  while (!ReceiveNextEvent (0, NULL, kEventDurationNoWait,
                             kEventRemoveFromQueue, &eventRef))
-#endif /* !USE_CARBON_EVENTS */
+#endif /* USE_CARBON_EVENTS */
     {
       int do_help = 0;
       struct frame *f;
 
-      expected = 0;
-
       /* 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
@@ -8055,13 +8122,7 @@ XTread_socket (sd, expected, hold_quit)
                                   NULL, &window_ptr);
                 f = mac_window_to_frame (window_ptr);
                 if (f && !f->async_iconified)
-                  {
-                    int x, y;
-                    
-                    x_real_positions (f, &x, &y);
-                    f->left_pos = x;
-                    f->top_pos = y;
-                  }
+                  x_real_positions (f, &f->left_pos, &f->top_pos);
                 SendEventToEventTarget (eventRef, toolbox_dispatcher);
               }
             break;
@@ -8070,7 +8131,7 @@ XTread_socket (sd, expected, hold_quit)
               {
                 SInt32 delta;
                 Point point;
-                WindowPtr window_ptr = mac_front_window ();
+                WindowPtr window_ptr = front_emacs_window ();
 
                 if (!IsValidWindowPtr (window_ptr))
                   {
@@ -8132,33 +8193,28 @@ XTread_socket (sd, expected, hold_quit)
               }
             else
               {
-                window_ptr = FrontWindow ();
+                part_code = FindWindow (er.where, &window_ptr);
                 if (tip_window && window_ptr == tip_window)
                   {
                     HideWindow (tip_window);
-                    window_ptr = FrontWindow ();
+                    part_code = FindWindow (er.where, &window_ptr);
                   }
-
-                if (!is_emacs_window (window_ptr))
-                  break;
-
-                part_code = FindWindow (er.where, &window_ptr);
               }
 
+            if (er.what != mouseDown && part_code != inContent)
+              break;
+
             switch (part_code)
               {
               case inMenuBar:
-                if (er.what == mouseDown)
-                  {
-                    f = mac_window_to_frame (mac_front_window ());
-                    saved_menu_event_location = er.where;
-                    inev.kind = MENU_BAR_ACTIVATE_EVENT;
-                    XSETFRAME (inev.frame_or_window, f);
-                  }
+                f = mac_window_to_frame (front_emacs_window ());
+                saved_menu_event_location = er.where;
+                inev.kind = MENU_BAR_ACTIVATE_EVENT;
+                XSETFRAME (inev.frame_or_window, f);
                 break;
 
               case inContent:
-                if (window_ptr != mac_front_window ())
+                if (window_ptr != front_emacs_window ())
                   SelectWindow (window_ptr);
                 else
                   {
@@ -8255,7 +8311,7 @@ XTread_socket (sd, expected, hold_quit)
                       }
                     else
                       {
-                        if (dpyinfo->grabbed & (1 << inev.code) == 0)
+                        if ((dpyinfo->grabbed & (1 << inev.code)) == 0)
                           /* If a button is released though it was not
                              previously pressed, that would be because
                              of multi-button emulation.  */
@@ -8278,27 +8334,16 @@ XTread_socket (sd, expected, hold_quit)
 
               case inDrag:
 #if TARGET_API_MAC_CARBON
-                if (er.what == mouseDown)
-                  {
-                    BitMap bm;
-
-                    GetQDGlobalsScreenBits (&bm);
-                    DragWindow (window_ptr, er.where, &bm.bounds);
-                  }
+                DragWindow (window_ptr, er.where, NULL);
 #else /* not TARGET_API_MAC_CARBON */
                 DragWindow (window_ptr, er.where, &qd.screenBits.bounds);
 #endif /* not TARGET_API_MAC_CARBON */
                 /* Update the frame parameters.  */
                 {
                   struct frame *f = mac_window_to_frame (window_ptr);
+
                   if (f && !f->async_iconified)
-                    {
-                      int x, y;
-                      
-                      x_real_positions (f, &x, &y);
-                      f->left_pos = x;
-                      f->top_pos = y;
-                    }
+                    x_real_positions (f, &f->left_pos, &f->top_pos);
                 }
                 break;
 
@@ -8313,11 +8358,8 @@ XTread_socket (sd, expected, hold_quit)
 
                 /* window resize handling added --ben */
               case inGrow:
-                if (er.what == mouseDown)
-                  {
-                    do_grow_window(window_ptr, &er);
-                    break;
-                  }
+                do_grow_window (window_ptr, &er);
+                break;
 
                 /* window zoom handling added --ben */
               case inZoomIn:
@@ -8460,7 +8502,7 @@ XTread_socket (sd, expected, hold_quit)
 #endif
 
 #if TARGET_API_MAC_CARBON
-            if (!IsValidWindowPtr (mac_front_window ()))
+            if (!IsValidWindowPtr (front_emacs_window ()))
               {
                 SysBeep (1);
                 break;
@@ -8564,7 +8606,7 @@ XTread_socket (sd, expected, hold_quit)
           inev.modifiers = mac_to_emacs_modifiers (er.modifiers);
 #endif
           XSETFRAME (inev.frame_or_window,
-                     mac_window_to_frame (mac_front_window ()));
+                     mac_window_to_frame (front_emacs_window ()));
           inev.timestamp = er.when * (1000 / 60);  /* ticks to milliseconds */
           break;
 
@@ -8581,16 +8623,16 @@ XTread_socket (sd, expected, hold_quit)
               WindowPtr wp;
               Lisp_Object frame;
 
-              wp = mac_front_window ();
+              wp = front_emacs_window ();
 
               if (!wp)
                 {
                   struct frame *f = XFRAME (XCAR (Vframe_list));
                   CollapseWindow (FRAME_MAC_WINDOW (f), false);
-                  wp = mac_front_window ();
+                  wp = front_emacs_window ();
                 }
 
-              if (wp && is_emacs_window (wp))
+              if (wp)
                 f = mac_window_to_frame (wp);
 
               inev.kind = DRAG_N_DROP_EVENT;
@@ -9047,7 +9089,7 @@ mac_check_for_quit_char ()
       e.arg = Qnil;
       e.modifiers = NULL;
       e.timestamp = EventTimeToTicks (GetEventTime (event)) * (1000/60);
-      XSETFRAME (e.frame_or_window, mac_window_to_frame (mac_front_window ()));
+      XSETFRAME (e.frame_or_window, mac_window_to_frame (front_emacs_window ()));
       /* Remove event from queue to prevent looping. */
       RemoveEventFromQueue (GetMainEventQueue (), event);
       ReleaseEvent (event);
diff --git a/src/window.c b/src/window.c
index c64e8557b56..22ca145b206 100644
--- a/src/window.c
+++ b/src/window.c
@@ -609,9 +609,6 @@ coordinates_in_window (w, x, y)
   int grabbable_width = ux;
   int lmargin_width, rmargin_width, text_left, text_right;
 
-  if (*x < x0 || *x >= x1)
-    return ON_NOTHING;
-
   /* In what's below, we subtract 1 when computing right_x because we
      want the rightmost pixel, which is given by left_pixel+width-1.  */
   if (w->pseudo_window_p)
@@ -661,6 +658,9 @@ coordinates_in_window (w, x, y)
             return ON_VERTICAL_BORDER;
         }
 
+      if (*x < x0 || *x >= x1)
+        return ON_NOTHING;
+
       /* Convert X and Y to window relative coordinates.
          Mode line starts at left edge of window.  */
       *x -= x0;
@@ -675,6 +675,9 @@ coordinates_in_window (w, x, y)
       goto header_vertical_border_check;
     }
 
+  if (*x < x0 || *x >= x1)
+    return ON_NOTHING;
+
   /* Outside any interesting column?  */
   if (*x < left_x || *x > right_x)
     return ON_SCROLL_BAR;
@@ -6036,9 +6039,9 @@ display marginal areas and the text area.  */)
   struct window *w = decode_window (window);
 
   if (!NILP (left))
-    CHECK_NUMBER (left);
+    CHECK_NATNUM (left);
   if (!NILP (right))
-    CHECK_NUMBER (right);
+    CHECK_NATNUM (right);
 
   if (!EQ (w->left_fringe_width, left)
       || !EQ (w->right_fringe_width, right)
@@ -6098,7 +6101,7 @@ If TYPE is t, use the frame's scroll-bar type.  */)
   struct window *w = decode_window (window);
 
   if (!NILP (width))
-    CHECK_NUMBER (width);
+    CHECK_NATNUM (width);
 
   if (XINT (width) == 0)
     vertical_type = Qnil;
diff --git a/src/xdisp.c b/src/xdisp.c
index 3d52e60c12f..0e25b0a3de3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -215,6 +215,8 @@ extern int pending_menu_activation;
 extern int interrupt_input;
 extern int command_loop_level;
 
+extern Lisp_Object do_mouse_tracking;
+
 extern int minibuffer_auto_raise;
 extern Lisp_Object Vminibuffer_list;
 
@@ -20762,6 +20764,10 @@ define_frame_cursor1 (f, cursor, pointer)
      Cursor cursor;
      Lisp_Object pointer;
 {
+  /* Do not change cursor shape while dragging mouse.  */
+  if (!NILP (do_mouse_tracking))
+    return;
+
   if (!NILP (pointer))
     {
       if (EQ (pointer, Qarrow))
@@ -21625,6 +21631,9 @@ x_draw_vertical_border (w)
      do it for frames with vertical scroll bars because either the
      right scroll bar of a window, or the left scroll bar of its
      neighbor will suffice as a border.  */
+  if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
+    return;
+
   if (!WINDOW_RIGHTMOST_P (w)
       && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
     {
diff --git a/src/xterm.c b/src/xterm.c
index 17efe655410..69e04de2eb8 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3380,12 +3380,14 @@ x_find_modifier_meanings (dpyinfo)
      Alt keysyms are on.  */
   {
     int row, col;       /* The row and column in the modifier table.  */
+    int found_alt_or_meta;
 
     for (row = 3; row < 8; row++)
+    {
+      found_alt_or_meta = 0;
       for (col = 0; col < mods->max_keypermod; col++)
         {
-          KeyCode code
-            = mods->modifiermap[(row * mods->max_keypermod) + col];
+          KeyCode code = mods->modifiermap[(row * mods->max_keypermod) + col];
 
           /* Zeroes are used for filler.  Skip them.  */
           if (code == 0)
@@ -3403,33 +3405,44 @@ x_find_modifier_meanings (dpyinfo)
                   {
                   case XK_Meta_L:
                   case XK_Meta_R:
+                    found_alt_or_meta = 1;
                     dpyinfo->meta_mod_mask |= (1 << row);
                     break;
 
                   case XK_Alt_L:
                   case XK_Alt_R:
+                    found_alt_or_meta = 1;
                     dpyinfo->alt_mod_mask |= (1 << row);
                     break;
 
                   case XK_Hyper_L:
                   case XK_Hyper_R:
-                    dpyinfo->hyper_mod_mask |= (1 << row);
+                    if (!found_alt_or_meta)
+                      dpyinfo->hyper_mod_mask |= (1 << row);
+                    code_col = syms_per_code;
+                    col = mods->max_keypermod;
                     break;
 
                   case XK_Super_L:
                   case XK_Super_R:
-                    dpyinfo->super_mod_mask |= (1 << row);
+                    if (!found_alt_or_meta)
+                      dpyinfo->super_mod_mask |= (1 << row);
+                    code_col = syms_per_code;
+                    col = mods->max_keypermod;
                     break;
 
                   case XK_Shift_Lock:
                     /* Ignore this if it's not on the lock modifier.  */
-                    if ((1 << row) == LockMask)
+                    if (!found_alt_or_meta && ((1 << row) == LockMask))
                       dpyinfo->shift_lock_mask = LockMask;
+                    code_col = syms_per_code;
+                    col = mods->max_keypermod;
                     break;
                   }
               }
           }
         }
+    }
   }
 
   /* If we couldn't find any meta keys, accept any alt keys as meta keys.  */
@@ -5050,9 +5063,15 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
   /* Compute the left edge of the scroll bar.  */
 #ifdef USE_TOOLKIT_SCROLL_BARS
   if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
-    sb_left = left + width - sb_width - (width - sb_width) / 2;
+    sb_left = (left +
+               (WINDOW_RIGHTMOST_P (w)
+                ? width - sb_width - (width - sb_width) / 2
+                : 0));
   else
-    sb_left = left + (width - sb_width) / 2;
+    sb_left = (left +
+               (WINDOW_LEFTMOST_P (w)
+                ? (width - sb_width) / 2
+                : width - sb_width));
 #else
   if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
     sb_left = left + width - sb_width;
@@ -5105,19 +5124,20 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
                                  width);
 #else /* not USE_GTK */
 
-      /* Since toolkit scroll bars are smaller than the space reserved
-         for them on the frame, we have to clear "under" them.  */
-      if (width > 0 && height > 0)
-        x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                          left, top, width, height, False);
       /* Move/size the scroll bar widget.  */
       if (mask)
+        {
+          /* Since toolkit scroll bars are smaller than the space reserved
+             for them on the frame, we have to clear "under" them.  */
+          if (width > 0 && height > 0)
+            x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+                          left, top, width, height, False);
           XtConfigureWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar),
                              sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
                              top,
                              sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
                              max (height, 1), 0);
-
+        }
 #endif /* not USE_GTK */
 #else /* not USE_TOOLKIT_SCROLL_BARS */