Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

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

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

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


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

11 files changed, 226 insertions, 101 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 383f479aabd..a1fa10e753c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,68 @@
+2004-07-01  Kenichi Handa  <handa@m17n.org>
+
+        * w32select.c (Fw32_set_clipboard_data): Update `nbytes' correctly
+        after getting a new string by pre-write-conversion.
+
+2004-06-30  Stefan  <monnier@iro.umontreal.ca>
+
+        * xterm.c (x_detect_focus_change): Remove unused var `nr_events'.
+        (x_calc_absolute_position): Remove unused var `child'.
+
+        * xfaces.c (x_supports_face_attributes_p)
+        (Fdisplay_supports_face_attributes_p): YAILOM.
+        (tty_supports_face_attributes_p): Remove unused var `i'.
+
+        * syntax.c (skip_chars): Remove unused labels fwd_unibyte_ok and
+        back_unibyte_ok.
+
+        * search.c (match_limit, Fmatch_data, Fset_match_data): YAILOM.
+
+        * fontset.c (Fset_fontset_font): Remove unused vars `family' and `registry'.
+
+        * Makefile.in (${etc}DOC): Fix file name of make-docfile.
+
+2004-06-30  Andreas Schwab  <schwab@suse.de>
+
+        * image.c (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
+        (Finit_image_library): Pass LIBRARIES through to
+        CHECK_LIB_AVAILABLE.  Declare parameters.  Doc fix.
+        (lookup_image_type): Pass Qnil as second argument to
+        Finit_image_library.
+
+        * lisp.h: Declare Finit_image_library.
+
+2004-06-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (do_window_activate, do_window_deactivate): Remove.
+        (XTread_socket): Send mouse button events to the toolbox
+        dispatcher even when the mouse is grabbed.  Don't process window
+        activate events for non-Emacs windows.  Replace function calls to
+        do_window_activate and do_window_deactivate with their contents.
+        Reset mouse grabbing status when a window is deactivated.
+
+2004-06-29  Steven Tamm  <steventamm@mac.com>
+
+        * macterm.c (mac_get_emulated_btn)
+        (mac_event_to_emacs_modifiers): Fix emulated mouse button
+        support to correctly mask out modifiers.
+
+2004-06-29  David Kastrup  <dak@gnu.org>
+
+        * search.c (Fset_match_data): Allow buffer before end of list
+        which can happen if set-match-data is using a pre-consed list.
+
+2004-06-28  Steven Tamm  <steventamm@mac.com>
+
+        * macterm.c (XTread_socket): Correctly set the frame position
+        after the window is moved.
+
+2004-06-28  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_get_image_for_pixmap): Call g_object_unref on
+        gpix and gmask just before return to avoid memory leak.
+        (xg_get_image_for_pixmap): Add workaround for monochrome displays
+        so insensitive and activated icons look ok.
+
 2004-06-27  Jason Rumney  <jasonr@gnu.org>
 
         * w32fns.c (file_dialog_callback): Disable edit control if set
@@ -28,8 +93,7 @@
         a buffer, add the buffer as last element to the match data.
         (Fset_match_data): If an additional element of the match-data is a
         buffer, restore it to last_thing_searched.
-        (save_search_regs): Save last_thing_searched as part of the match
-        data.
+        (save_search_regs): Save last_thing_searched as part of the match data.
         (restore_match_data): Restore it again.
 
 2004-06-23  Luc Teirlinck  <teirllm@auburn.edu>
@@ -155,7 +219,7 @@
 2004-06-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (xg_get_image_for_pixmap): New function.
-        (xg_get_gdk_pixmap_and_mask): Removed.
+        (xg_get_gdk_pixmap_and_mask): Remove.
         (update_frame_tool_bar): Call xg_get_image_for_pixmap instead of
         xg_get_gdk_pixmap_and_mask.
 
@@ -176,8 +240,7 @@
         list of possible filenames.
         (init_xpm_functions, init_png_functions, init_jpeg_functions)
         (init_tiff_functions, init_gif_functions): Use `w32_delayed_load'.
-        (CHECK_LIB_AVAILABLE): Call `define_image_library' with new
-        argument.
+        (CHECK_LIB_AVAILABLE): Call `define_image_library' with new argument.
         (Finit_image_library): New function, extracted from `init_image'.
         Try to initialize an image library on demand and cache whether we
         were successful or not.
@@ -301,7 +364,7 @@
         (merge_face_ref, face_at_buffer_position, face_at_string_position):
         Use `merge_named_face'.
         (merge_face_inheritance): Function removed.
-        (merge_face_ref): Renamed from `merge_face_vector_with_property'.
+        (merge_face_ref): Rename from `merge_face_vector_with_property'.
         Add new `err_msgs' and `named_merge_points' args.  Return error
         status.  Only print error messages if ERR_MSGS is true.  Don't try to
         do :inherit attribute validation.
@@ -361,8 +424,8 @@
 
         * xfaces.c (x_supports_face_attributes_p): Make this function
         conditional on HAVE_WINDOW_SYSTEM.
-        (Fdisplay_supports_face_attributes_p) [HAVE_WINDOW_SYSTEM]: Don't
-        call x_supports_face_attributes_p if it was not compiled in.
+        (Fdisplay_supports_face_attributes_p) [HAVE_WINDOW_SYSTEM]:
+        Don't call x_supports_face_attributes_p if it was not compiled in.
 
 2004-06-04  Miles Bader  <miles@gnu.org>
 
@@ -393,6 +456,8 @@
 
 2004-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * eval.c (Fcondition_case): Fix usage.  Simplify.
+
         * mem-limits.h (EXCEEDS_LISP_PTR) [USE_LSB_TAG]: Never true.
 
 2004-05-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
@@ -401,8 +466,7 @@
         [MAC_OSX]: Don't include QuickTime/QuickTime.h.
         [!MAC_OSX]: Don't include alloca.h, Windows.h, Gestalt.h, or
         TextUtils.h.
-        (Fx_create_frame): Sync with xfns.c.  Initialize cursor
-        descriptors.
+        (Fx_create_frame): Sync with xfns.c.  Initialize cursor descriptors.
         (Fx_display_mm_height, Fx_display_mm_width): Calculate length from
         display height/width.
         (compute_tip_xy, Vx_max_tooltip_size): Declare.
@@ -413,8 +477,7 @@
 
         * macgui.h [!MAC_OSX]: Include Gestalt.h.
         (Cursor, No_Cursor): New defines.
-        [!TARGET_API_MAC_CARBON] (SetPortWindowPort): New compatibility
-        macro.
+        [!TARGET_API_MAC_CARBON] (SetPortWindowPort): New compatibility macro.
         [!TARGET_API_MAC_CARBON] (arrow_cursor): Declare.
 
         * macmenu.c (mac_menu_show, mac_dialog): Use SetPortWindowPort.
@@ -442,11 +505,9 @@
         (x_scroll_bar_handle_click): Set `(PORTION . WHOLE)' part in a
         scroll-bar click event.
         (mac_define_frame_cursor): Change the pointer shape.
-        (x_free_frame_resources): Reset tip_window to NULL when it is
-        disposed.
+        (x_free_frame_resources): Reset tip_window to NULL when it is disposed.
         [!TARGET_API_MAC_CARBON] (arrow_cursor): New variable.
-        [!TARGET_API_MAC_CARBON] (do_init_managers): Initialize
-        arrow_cursor.
+        [!TARGET_API_MAC_CARBON] (do_init_managers): Initialize arrow_cursor.
         (do_window_update): Don't do anything if the updated window is the
         tooltip window.
         (do_mouse_moved): Handle mouse movement events here (previously in
@@ -454,8 +515,8 @@
         dpyinfo->mouse_face_hidden is set.
         (do_os_event, do_events): Remove (now in XTread_socket).
         (XTread_socket): Immediately return if interrupt_input_blocked.
-        Loop until all the events in the queue are processed.  Rearrange
-        codes for mouse grabbing.  Add tooltip support.  Include the
+        Loop until all the events in the queue are processed.
+        Rearrange codes for mouse grabbing.  Add tooltip support.  Include the
         contents of do_os_event and do_events.  Remove mouse movement
         handling (now in do_mouse_moved).  Add the case where
         Vmouse_highlight has an integer value.
@@ -464,8 +525,8 @@
         excess initializations.
         (make_mac_terminal_frame): Previous initializations in
         make_mac_frame are moved here.
-        (mac_initialize_display_info): Initialize
-        dpyinfo->mouse_face_overlay and dpyinfo->mouse_face_hidden.
+        (mac_initialize_display_info):
+        Initialize dpyinfo->mouse_face_overlay and dpyinfo->mouse_face_hidden.
 
         * xdisp.c [MAC_OS] (No_Cursor): Remove variable.
         (define_frame_cursor1): Don't treat HAVE_CARBON as a special case.
diff --git a/src/Makefile.in b/src/Makefile.in
index 0d75221acfa..f473888cc5d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -928,7 +928,7 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
    for the first time, this prevents any variation between configurations
    in the contents of the DOC file.
    Likewise for ${SOME_MACHINE_LISP}.  */
-${etc}DOC: ${libsrc}make-docfile ${obj} ${shortlisp} ${SOME_MACHINE_LISP}
+${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${shortlisp} ${SOME_MACHINE_LISP}
         -rm -f ${etc}DOC
         ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
         ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}
diff --git a/src/fontset.c b/src/fontset.c
index aae6b9296ae..e99cc0ff6a3 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,4 +1,5 @@
 /* Fontset handler.
+   Copyright (C) 2004  Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 84aa9f46d4d..3ffba0ba745 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -248,8 +248,46 @@ xg_get_image_for_pixmap (f, img, widget, old_widget)
 {
   GdkPixmap *gpix;
   GdkPixmap *gmask;
-  GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f));
+  GdkDisplay *gdpy;
+
+  /* If we are on a one bit display, let GTK do all the image handling.
+     This seems to be the only way to make insensitive and activated icons
+     look good.  */
+  if (x_screen_planes (f) == 1)
+    {
+      Lisp_Object specified_file = Qnil;
+      Lisp_Object tail;
+      extern Lisp_Object QCfile;
+
+      for (tail = XCDR (img->spec);
+           NILP (specified_file) && CONSP (tail) && CONSP (XCDR (tail));
+           tail = XCDR (XCDR (tail)))
+        if (EQ (XCAR (tail), QCfile))
+          specified_file = XCAR (XCDR (tail));
+
+        if (STRINGP (specified_file))
+          {
+
+            Lisp_Object file = Qnil;
+            struct gcpro gcpro1;
+            GCPRO1 (file);
 
+            file = x_find_image_file (specified_file);
+            /* We already loaded the image once before calling this
+               function, so this should not fail.  */
+            xassert (STRINGP (file) != 0);
+
+            if (! old_widget)
+              old_widget = GTK_IMAGE (gtk_image_new_from_file (SDATA (file)));
+            else
+              gtk_image_set_from_file (old_widget, SDATA (file));
+
+            UNGCPRO;
+            return GTK_WIDGET (old_widget);
+          }
+    }
+
+  gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f));
   gpix = gdk_pixmap_foreign_new_for_display (gdpy, img->pixmap);
   gmask = img->mask ? gdk_pixmap_foreign_new_for_display (gdpy, img->mask) : 0;
 
@@ -262,6 +300,12 @@ xg_get_image_for_pixmap (f, img, widget, old_widget)
     }
   else
     {
+      /* This is a workaround to make icons look good on pseudo color
+         displays.  Apparently GTK expects the images to have an alpha
+         channel.  If they don't, insensitive and activated icons will
+         look bad.  This workaround does not work on monochrome displays,
+         and is not needed on true color/static color displays (i.e.
+         16 bits and higher).  */
       int x, y, width, height, rowstride, mask_rowstride;
       GdkPixbuf *icon_buf, *tmp_buf;
       guchar *pixels;
@@ -308,12 +352,9 @@ xg_get_image_for_pixmap (f, img, widget, old_widget)
                 }
             }
 
-          g_object_unref (G_OBJECT (gmask));
           g_object_unref (G_OBJECT (mask_buf));
         }
 
-      g_object_unref (G_OBJECT (gpix));
-
       if (! old_widget)
         old_widget = GTK_IMAGE (gtk_image_new_from_pixbuf (icon_buf));
       else
@@ -322,6 +363,9 @@ xg_get_image_for_pixmap (f, img, widget, old_widget)
       g_object_unref (G_OBJECT (icon_buf));
     }
 
+  g_object_unref (G_OBJECT (gpix));
+  if (gmask) g_object_unref (G_OBJECT (gmask));
+
   return GTK_WIDGET (old_widget);
 }
 
diff --git a/src/image.c b/src/image.c
index 438e132807f..4ab672ca58e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -675,7 +675,7 @@ define_image_type (type, loaded)
       success = Qt;
     }
 
-  CACHE_IMAGE_TYPE(*type->type, success);
+  CACHE_IMAGE_TYPE (*type->type, success);
   return success;
 }
 
@@ -690,7 +690,7 @@ lookup_image_type (symbol)
   struct image_type *type;
 
   /* We must initialize the image-type if it hasn't been already.  */
-  if (NILP (Finit_image_library (symbol)))
+  if (NILP (Finit_image_library (symbol, Qnil)))
     return 0;                   /* unimplemented */
 
   for (type = image_types; type; type = type->next)
@@ -7927,10 +7927,10 @@ DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "")
 #ifdef HAVE_NTGUI
 /* Image types that rely on external libraries are loaded dynamically
    if the library is available.  */
-#define CHECK_LIB_AVAILABLE(image_type, init_lib_fn) \
+#define CHECK_LIB_AVAILABLE(image_type, init_lib_fn, libraries) \
   define_image_type (image_type, init_lib_fn (libraries))
 #else
-#define CHECK_LIB_AVAILABLE(image_type, init_lib_fn) \
+#define CHECK_LIB_AVAILABLE(image_type, init_lib_fn, libraries) \
   define_image_type (image_type, TRUE)
 #endif /* HAVE_NTGUI */
 
@@ -7940,8 +7940,9 @@ Return non-nil if TYPE is a supported image type.
 
 Image types pbm and xbm are prebuilt; other types are loaded here.
 Libraries to load are specified in alist LIBRARIES (usually, the value
-of `image-library-alist', which see.  */)
+of `image-library-alist', which see).  */)
   (type, libraries)
+  Lisp_Object type, libraries;
 {
   Lisp_Object tested;
 
@@ -7952,36 +7953,36 @@ of `image-library-alist', which see.  */)
 
 #if defined (HAVE_XPM) || defined (MAC_OS)
   if (EQ (type, Qxpm))
-    return CHECK_LIB_AVAILABLE(&xpm_type, init_xpm_functions);
+    return CHECK_LIB_AVAILABLE (&xpm_type, init_xpm_functions, libraries);
 #endif
 
 #if defined (HAVE_JPEG) || defined (MAC_OS)
   if (EQ (type, Qjpeg))
-    return CHECK_LIB_AVAILABLE(&jpeg_type, init_jpeg_functions);
+    return CHECK_LIB_AVAILABLE (&jpeg_type, init_jpeg_functions, libraries);
 #endif
 
 #if defined (HAVE_TIFF) || defined (MAC_OS)
   if (EQ (type, Qtiff))
-    return CHECK_LIB_AVAILABLE(&tiff_type, init_tiff_functions);
+    return CHECK_LIB_AVAILABLE (&tiff_type, init_tiff_functions, libraries);
 #endif
 
 #if defined (HAVE_GIF) || defined (MAC_OS)
   if (EQ (type, Qgif))
-    return CHECK_LIB_AVAILABLE(&gif_type, init_gif_functions);
+    return CHECK_LIB_AVAILABLE (&gif_type, init_gif_functions, libraries);
 #endif
 
 #if defined (HAVE_PNG) || defined (MAC_OS)
   if (EQ (type, Qpng))
-    return CHECK_LIB_AVAILABLE(&png_type, init_png_functions);
+    return CHECK_LIB_AVAILABLE (&png_type, init_png_functions, libraries);
 #endif
 
 #ifdef HAVE_GHOSTSCRIPT
   if (EQ (type, Qpostscript))
-    return CHECK_LIB_AVAILABLE(&gs_type, init_gs_functions);
+    return CHECK_LIB_AVAILABLE (&gs_type, init_gs_functions, libraries);
 #endif
 
   /* If the type is not recognized, avoid testing it ever again.  */
-  CACHE_IMAGE_TYPE(type, Qnil);
+  CACHE_IMAGE_TYPE (type, Qnil);
   return Qnil;
 }
 
diff --git a/src/lisp.h b/src/lisp.h
index 44fe5affa57..deb8d6414a2 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2332,6 +2332,7 @@ extern void init_fringe P_ ((void));
 extern void init_fringe_once P_ ((void));
 
 /* Defined in image.c */
+EXFUN (Finit_image_library, 2);
 extern void syms_of_image P_ ((void));
 extern void init_image P_ ((void));
 
diff --git a/src/macterm.c b/src/macterm.c
index 2af910c5003..43a04dc65ec 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -7018,7 +7018,7 @@ mac_get_emulated_btn ( UInt32 modifiers )
   int result = 0;
   if (!NILP (Vmac_emulate_three_button_mouse)) {
     int cmdIs3 = !EQ (Vmac_emulate_three_button_mouse, Qreverse);
-    if (modifiers & controlKey)
+    if (modifiers & cmdKey)
       result = cmdIs3 ? 2 : 1;
     else if (modifiers & optionKey)
       result = cmdIs3 ? 1 : 2;
@@ -7038,7 +7038,7 @@ mac_event_to_emacs_modifiers (EventRef eventRef)
   if (!NILP (Vmac_emulate_three_button_mouse) &&
       GetEventClass(eventRef) == kEventClassMouse)
     {
-      mods &= ~(optionKey & cmdKey);
+      mods &= ~(optionKey | cmdKey);
     }
   return mac_to_emacs_modifiers (mods);
 }
@@ -7237,40 +7237,6 @@ is_emacs_window (WindowPtr win)
 }
 
 static void
-do_window_activate (WindowPtr win)
-{
-  struct frame *f;
-
-  if (is_emacs_window (win))
-    {
-      f = mac_window_to_frame (win);
-
-      if (f)
-        {
-          x_new_focus_frame (FRAME_MAC_DISPLAY_INFO (f), f);
-          activate_scroll_bars (f);
-        }
-    }
-}
-
-static void
-do_window_deactivate (WindowPtr win)
-{
-  struct frame *f;
-
-  if (is_emacs_window (win))
-    {
-      f = mac_window_to_frame (win);
-
-      if (f == FRAME_MAC_DISPLAY_INFO (f)->x_focus_frame)
-        {
-          x_new_focus_frame (FRAME_MAC_DISPLAY_INFO (f), 0);
-          deactivate_scroll_bars (f);
-        }
-    }
-}
-
-static void
 do_app_resume ()
 {
   WindowPtr wp;
@@ -8084,6 +8050,25 @@ XTread_socket (sd, expected, hold_quit)
       if (!mac_convert_event_ref (eventRef, &er))
         switch (GetEventClass (eventRef))
           {
+          case kEventClassWindow:
+            if (GetEventKind (eventRef) == kEventWindowBoundsChanged) 
+              {
+                WindowPtr window_ptr;
+                GetEventParameter(eventRef, kEventParamDirectObject,
+                                  typeWindowRef, NULL, sizeof(WindowPtr),
+                                  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;
+                  }
+                SendEventToEventTarget (eventRef, toolbox_dispatcher);
+              }
+            break;
           case kEventClassMouse:
             if (GetEventKind (eventRef) == kEventMouseWheelMoved)
               {
@@ -8135,6 +8120,14 @@ XTread_socket (sd, expected, hold_quit)
             SInt16 part_code;
             int tool_bar_p = 0;
 
+#if USE_CARBON_EVENTS
+            /* This is needed to send mouse events like aqua window
+               buttons to the correct handler.  */
+            if (SendEventToEventTarget (eventRef, toolbox_dispatcher)
+                != eventNotHandledErr)
+              break;
+#endif
+
             if (dpyinfo->grabbed && last_mouse_frame
                 && FRAME_LIVE_P (last_mouse_frame))
               {
@@ -8150,16 +8143,9 @@ XTread_socket (sd, expected, hold_quit)
                     window_ptr = FrontWindow ();
                   }
 
-#if USE_CARBON_EVENTS
-                /* This is needed to send mouse events like aqua
-                   window buttons to the correct handler.  */
-                if (SendEventToEventTarget (eventRef, toolbox_dispatcher)
-                    != eventNotHandledErr)
-                  break;
-
                 if (!is_emacs_window (window_ptr))
                   break;
-#endif
+
                 part_code = FindWindow (er.where, &window_ptr);
               }
 
@@ -8306,6 +8292,18 @@ XTread_socket (sd, expected, hold_quit)
 #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;
+                    }
+                }
                 break;
 
               case inGoAway:
@@ -8393,24 +8391,38 @@ XTread_socket (sd, expected, hold_quit)
                 break;
               }
 
+            if (!is_emacs_window (window_ptr))
+              break;
+            
+            f = mac_window_to_frame (window_ptr);
+
             if ((er.modifiers & activeFlag) != 0)
               {
+                /* A window has been activated */
                 Point mouse_loc = er.where;
 
-                do_window_activate (window_ptr);
+                x_new_focus_frame (dpyinfo, f);
+                activate_scroll_bars (f);
 
                 SetPortWindowPort (window_ptr);
                 GlobalToLocal (&mouse_loc);
-                /* activateEvt counts as mouse movement,
+                /* Window-activated event counts as mouse movement,
                    so update things that depend on mouse position.  */
                 note_mouse_movement (mac_window_to_frame (window_ptr),
                                      &mouse_loc);
               }
             else
               {
-                do_window_deactivate (window_ptr);
+                /* A window has been deactivated */
+                dpyinfo->grabbed = 0;
+
+                if (f == dpyinfo->x_focus_frame)
+                  {
+                    x_new_focus_frame (dpyinfo, 0);
+                    deactivate_scroll_bars (f);
+                  }
+
 
-                f = mac_window_to_frame (window_ptr);
                 if (f == dpyinfo->mouse_face_mouse_frame)
                   {
                     /* If we move outside the frame, then we're
diff --git a/src/search.c b/src/search.c
index dc1ca91e38f..169baf05d55 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1,5 +1,6 @@
 /* String search routines for GNU Emacs.
-   Copyright (C) 1985, 86,87,93,94,97,98, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 86,87,93,94,97,98, 1999, 2004
+             Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2628,7 +2629,7 @@ match_limit (num, beginningp)
   CHECK_NUMBER (num);
   n = XINT (num);
   if (n < 0)
-    args_out_of_range (num, 0);
+    args_out_of_range (num, make_number (0));
   if (search_regs.num_regs <= 0)
     error ("No match data, because no search succeeded");
   if (n >= search_regs.num_regs
@@ -2728,10 +2729,9 @@ Return value is undefined if the last search failed.  */)
         data[2 * i] = data [2 * i + 1] = Qnil;
     }
 
-  if (BUFFERP(last_thing_searched)
-      && ! NILP (integers))
+  if (BUFFERP (last_thing_searched) && !NILP (integers))
     {
-      XSETBUFFER(data[len], last_thing_searched);
+      data[len] = last_thing_searched;
       len++;
     }
 
@@ -2808,9 +2808,16 @@ LIST should have been created by calling `match-data' previously.  */)
         search_regs.num_regs = length;
       }
 
-    for (i = 0; i < length; i++)
+    for (i = 0;; i++)
       {
         marker = Fcar (list);
+        if (BUFFERP (marker))
+          {
+            last_thing_searched = marker;
+            break;
+          }
+        if (i >= length)
+          break;
         if (NILP (marker))
           {
             search_regs.start[i] = -1;
@@ -2847,10 +2854,6 @@ LIST should have been created by calling `match-data' previously.  */)
       search_regs.start[i] = -1;
   }
 
-  if (CONSP(list) && BUFFERP(XCAR(list))) {
-    XSETBUFFER(last_thing_searched, XCAR(list));
-  }
-
   return Qnil;
 }
 
diff --git a/src/syntax.c b/src/syntax.c
index 302250c39a4..83763061d82 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1734,7 +1734,6 @@ skip_chars (forwardp, syntaxp, string, lim, handle_iso_classes)
                   if (!fastmap[*p])
                     break;
 
-                fwd_unibyte_ok:
                   p++, pos++;
                 }
           }
@@ -1808,7 +1807,6 @@ skip_chars (forwardp, syntaxp, string, lim, handle_iso_classes)
                   if (!fastmap[p[-1]])
                     break;
 
-                back_unibyte_ok:
                   p--, pos--;
                 }
           }
diff --git a/src/w32select.c b/src/w32select.c
index 0c8849c7be6..20f7cfc457f 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -130,6 +130,8 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data,
 
   BLOCK_INPUT;
 
+  /* Include the terminating NULL character in the source of
+     conversion.  */
   nbytes = SBYTES (string) + 1;
   src = SDATA (string);
   dst = src;
@@ -208,7 +210,9 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data,
           {
             string = run_pre_post_conversion_on_str (string, &coding, 1);
             src = SDATA (string);
-            nbytes = SBYTES (string);
+            /* Include the terminating NULL character in the source of
+               conversion.  */
+            nbytes = SBYTES (string) + 1;
           }
         coding.src_multibyte = 1;
         coding.dst_multibyte = 0;
diff --git a/src/xfaces.c b/src/xfaces.c
index a5d5c97a332..ce40e053b20 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5851,7 +5851,7 @@ x_supports_face_attributes_p (f, attrs, def_face)
       face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0));
 
       if (! face)
-        signal_error ("cannot make face", 0);
+        error ("cannot make face");
 
       /* If the font is the same, then not supported.  */
       if (face->font == def_face->font)
@@ -5886,7 +5886,7 @@ tty_supports_face_attributes_p (f, attrs, def_face)
      Lisp_Object *attrs;
      struct face *def_face;
 {
-  int weight, i;
+  int weight;
   Lisp_Object val, fg, bg;
   XColor fg_tty_color, fg_std_color;
   XColor bg_tty_color, bg_std_color;
@@ -6108,7 +6108,7 @@ face for italic. */)
   if (def_face == NULL)
     {
       if (! realize_basic_faces (f))
-        signal_error ("Cannot realize default face", 0);
+        error ("Cannot realize default face");
       def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
     }