Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-56
   Update from CVS: Add lisp/legacy-gnus-agent.el

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

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


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

18 files changed, 406 insertions, 232 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7b22f043009..1490b34b4a9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,103 @@
+2004-10-25  Kenichi Handa  <handa@m17n.org>
+
+        * fontset.c (fontset_pattern_regexp): Optimize for the case that
+        PATTERN is full XLFD.
+
+2004-10-24  Kenichi Handa  <handa@m17n.org>
+
+        * regex.h (enum reg_errcode_t): New value REG_ERANGEX.
+
+        * regex.c (re_error_msgid): Add an entry for REG_ERANGEX.
+        (regex_compile): Return REG_ERANGEX if appropriate.
+
+2004-10-22  Kenichi Handa  <handa@m17n.org>
+
+        * editfns.c (Ftranslate_region_internal): New function.
+        (syms_of_editfns): Defsubr it.
+
+2004-10-22  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xfns.c (xic_create_xfontset): Initialize missing_list to NULL.
+
+2004-10-21  K,Aa(Broly L$,1 q(Brentey  <lorentey@elte.hu>
+
+        * xterm.h (x_output): New member `xic_base_fontname'.
+        (FRAME_XIC_BASE_FONTNAME): New macro.
+        (xic_free_xfontset): Declare.
+
+        * xfns.c (xic_create_xfontset): Share fontsets between frames
+        based on base_fontname.
+        (xic_free_xfontset): New function.
+        (free_frame_xic): Use it.
+        (xic_set_xfontset): Ditto.
+
+        * xterm.c (xim_destroy_callback): Ditto.
+
+
+2004-10-20  B. Anyos  <banyos@freemail.hu>  (tiny change)
+
+        * w32term.c (x_draw_glyph_string): Use overline_color for overlines.
+
+2004-10-20  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.h (XSync): If USE_GTK, define XSync as process_all and then
+        XSync.
+
+        * emacs.c (my_heap_start, heap_bss_diff, MAX_HEAP_BSS_DIFF):
+        New variables and constant.
+        (main): Calculate heap_bss_diff.  If we are dumping and the
+        heap_bss_diff is greater than MAX_HEAP_BSS_DIFF, set PER_LINUX32
+        and exec ourself again.
+        (Fdump_emacs): If heap_bss_diff is greater than MAX_HEAP_BSS_DIFF
+        print a warning.
+
+        * lastfile.c: Make my_endbss and my_endbss_static available on all
+        platforms.
+
+        * Makefile.in (RUN_TEMACS): Remove @SETARCH@.
+        * config.in (HAVE_PERSONALITY_LINUX32): Regenerate.
+
+2004-10-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * data.c (Flocal_variable_if_set_p): Doc fix.
+
+2004-10-19  Jason Rumney  <jasonr@gnu.org>
+
+        * w32.c (init_environment): Set emacs_dir correctly when running
+        emacs from the build directory.
+
+2004-10-19  Richard M. Stallman  <rms@gnu.org>
+
+        * editfns.c (Fdelete_and_extract_region):
+        If region is empty, return null string.
+
+2004-10-19  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.h (xg_update_scrollbar_pos): Remove arguments real_left
+        and canon_width.
+        (xg_frame_cleared): Removed.
+
+        * gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
+        xg_find_top_left_in_fixed): Removed.
+        (xg_create_scroll_bar): Put an event box widget between
+        the scroll bar widget and the edit widget.
+        (xg_show_scroll_bar): Show the parent widget (the event box).
+        (xg_remove_scroll_bar): Destroy parent (the event box) also.
+        (xg_update_scrollbar_pos): Remove arguments real_left and canon_width.
+        Move the parent (the event box) widget inside the fixed widget.
+        Move window clear to xterm.c.
+
+        * gtkutil.h (xg_frame_cleared): Removed.
+
+        * xterm.c (x_clear_frame): Remove call to xg_frame_cleared
+        (x_scroll_bar_create, XTset_vertical_scroll_bar): Remove
+        arguments left and width to xg_update_scrollbar_pos.
+        (XTset_vertical_scroll_bar): Do x_clear_area for USE_GTK also.
+
+2004-10-19  Kenichi Handa  <handa@m17n.org>
+
+        * xdisp.c (display_mode_element): Fix display of wide chars.
+
 2004-10-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (xg_update_scrollbar_pos): Change XClearWindow to
@@ -8,8 +108,7 @@
 
         * fontset.c (fs_load_font): Use fast_string_match_ignore_case for
         comparing font names.
-        (fs_query_fontset): Use fast_string_match for comparing fontset
-        names.
+        (fs_query_fontset): Use fast_string_match for comparing fontset names.
         (list_fontsets): Likewise.
 
         * search.c (fast_string_match_ignore_case): New function.
diff --git a/src/Makefile.in b/src/Makefile.in
index f85811c970a..9d169cd4bdc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -909,12 +909,7 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) \
 #define OBJECTS_MACHINE
 #endif
 
-#ifdef HAVE_RANDOM_HEAPSTART
-#undef i386
-RUN_TEMACS = @SETARCH@ i386 ./temacs
-#else
 RUN_TEMACS = ./temacs
-#endif
 
 all: emacs${EXEEXT} OTHER_FILES
 
diff --git a/src/config.in b/src/config.in
index f2cf822b6ff..a559a35885f 100644
--- a/src/config.in
+++ b/src/config.in
@@ -414,6 +414,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the <nlist.h> header file. */
 #undef HAVE_NLIST_H
 
+/* Define to 1 if personality LINUX32 can be set. */
+#undef HAVE_PERSONALITY_LINUX32
+
 /* Define to 1 if you have the png library (-lpng). */
 #undef HAVE_PNG
 
@@ -432,9 +435,6 @@ 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
 
@@ -757,9 +757,9 @@ Boston, MA 02111-1307, USA.  */
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
 /* Define to 1 if you have the ANSI C header files. */
diff --git a/src/data.c b/src/data.c
index 616e91c2d62..33b37376a49 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1794,7 +1794,11 @@ BUFFER defaults to the current buffer.  */)
 
 DEFUN ("local-variable-if-set-p", Flocal_variable_if_set_p, Slocal_variable_if_set_p,
        1, 2, 0,
-       doc: /* Non-nil if VARIABLE will be local in buffer BUFFER if it is set there.
+       doc: /* Non-nil if VARIABLE will be local in buffer BUFFER when set there.
+More precisely, this means that setting the variable \(with `set' or`setq'),
+while it does not have a `let'-style binding that was made in BUFFER,
+will produce a buffer local binding.  See Info node
+`(elisp)Creating Buffer-Local'.
 BUFFER defaults to the current buffer.  */)
      (variable, buffer)
      register Lisp_Object variable, buffer;
diff --git a/src/editfns.c b/src/editfns.c
index 51f8a71d531..5b129a18a62 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2736,8 +2736,10 @@ Both characters must have the same length of multi-byte form.  */)
   return Qnil;
 }
 
-DEFUN ("translate-region", Ftranslate_region, Stranslate_region, 3, 3, 0,
-       doc: /* From START to END, translate characters according to TABLE.
+DEFUN ("translate-region-internal", Ftranslate_region_internal,
+       Stranslate_region_internal, 3, 3, 0,
+       doc: /* Internal use only.
+From START to END, translate characters according to TABLE.
 TABLE is a string; the Nth character in it is the mapping
 for the character with code N.
 It returns the number of characters changed.  */)
@@ -2750,31 +2752,37 @@ It returns the number of characters changed.  */)
   register int nc;              /* New character. */
   int cnt;                      /* Number of changes made. */
   int size;                     /* Size of translate table. */
-  int pos, pos_byte;
+  int pos, pos_byte, end_pos;
   int multibyte = !NILP (current_buffer->enable_multibyte_characters);
   int string_multibyte;
 
   validate_region (&start, &end);
-  CHECK_STRING (table);
-
-  if (multibyte != (SCHARS (table) < SBYTES (table)))
-    table = (multibyte
-             ? string_make_multibyte (table)
-             : string_make_unibyte (table));
-  string_multibyte = SCHARS (table) < SBYTES (table);
+  if (CHAR_TABLE_P (table))
+    {
+      size = MAX_CHAR;
+      tt = NULL;
+    }
+  else
+    {
+      CHECK_STRING (table);
 
-  size = SCHARS (table);
-  tt = SDATA (table);
+      if (! multibyte && (SCHARS (table) < SBYTES (table)))
+        table = string_make_unibyte (table);
+      string_multibyte = SCHARS (table) < SBYTES (table);
+      size = SCHARS (table);
+      tt = SDATA (table);
+    }
 
   pos = XINT (start);
   pos_byte = CHAR_TO_BYTE (pos);
+  end_pos = XINT (end); 
   modify_region (current_buffer, pos, XINT (end));
 
   cnt = 0;
-  for (; pos < XINT (end); )
+  for (; pos < end_pos; )
     {
       register unsigned char *p = BYTE_POS_ADDR (pos_byte);
-      unsigned char *str;
+      unsigned char *str, buf[MAX_MULTIBYTE_LENGTH];
       int len, str_len;
       int oc;
 
@@ -2784,16 +2792,45 @@ It returns the number of characters changed.  */)
         oc = *p, len = 1;
       if (oc < size)
         {
-          if (string_multibyte)
+          if (tt)
             {
-              str = tt + string_char_to_byte (table, oc);
-              nc = STRING_CHAR_AND_LENGTH (str, MAX_MULTIBYTE_LENGTH, str_len);
+              if (string_multibyte)
+                {
+                  str = tt + string_char_to_byte (table, oc);
+                  nc = STRING_CHAR_AND_LENGTH (str, MAX_MULTIBYTE_LENGTH,
+                                               str_len);
+                }
+              else
+                {
+                  nc = tt[oc];
+                  if (! ASCII_BYTE_P (nc) && multibyte)
+                    {
+                      str_len = CHAR_STRING (nc, buf);
+                      str = buf;
+                    }
+                  else
+                    {
+                      str_len = 1;
+                      str = tt + oc;
+                    }
+                }
             }
           else
             {
-              str = tt + oc;
-              nc = tt[oc], str_len = 1;
+              Lisp_Object val;
+              int c;
+
+              nc = oc;
+              val = CHAR_TABLE_REF (table, oc);
+              if (INTEGERP (val)
+                  && (c = XINT (val), CHAR_VALID_P (c, 0)))
+                {
+                  nc = c;
+                  str_len = CHAR_STRING (nc, buf);
+                  str = buf;
+                }
             }
+
           if (nc != oc)
             {
               if (len != str_len)
@@ -2844,6 +2881,8 @@ DEFUN ("delete-and-extract-region", Fdelete_and_extract_region,
      Lisp_Object start, end;
 {
   validate_region (&start, &end);
+  if (XINT (start) == XINT (end))
+    return build_string ("");
   return del_range_1 (XINT (start), XINT (end), 1, 1);
 }
 
@@ -4288,7 +4327,7 @@ functions if all the text being accessed has this property.  */);
   defsubr (&Sinsert_buffer_substring);
   defsubr (&Scompare_buffer_substrings);
   defsubr (&Ssubst_char_in_region);
-  defsubr (&Stranslate_region);
+  defsubr (&Stranslate_region_internal);
   defsubr (&Sdelete_region);
   defsubr (&Sdelete_and_extract_region);
   defsubr (&Swiden);
diff --git a/src/emacs.c b/src/emacs.c
index bdca7aa3944..96e858d943a 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -68,6 +68,10 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/resource.h>
 #endif
 
+#ifdef HAVE_PERSONALITY_LINUX32
+#include <sys/personality.h>
+#endif
+
 #ifndef O_RDWR
 #define O_RDWR 2
 #endif
@@ -193,6 +197,17 @@ int display_arg;
    Tells GC how to save a copy of the stack.  */
 char *stack_bottom;
 
+/* The address where the heap starts (from the first sbrk (0) call).  */
+static void *my_heap_start;
+
+/* The gap between BSS end and heap start as far as we can tell.  */
+static unsigned long heap_bss_diff;
+
+/* If the gap between BSS end and heap start is larger than this we try to
+   work around it, and if that fails, output a warning in dump-emacs.  */
+#define MAX_HEAP_BSS_DIFF (1024*1024)
+
+
 #ifdef HAVE_WINDOW_SYSTEM
 extern Lisp_Object Vinitial_window_system;
 #endif /* HAVE_WINDOW_SYSTEM */
@@ -734,7 +749,11 @@ malloc_initialize_hook ()
       free (malloc_state_ptr);
     }
   else
-    malloc_using_checking = getenv ("MALLOC_CHECK_") != NULL;
+    {
+      if (my_heap_start == 0)
+        my_heap_start = sbrk (0);
+      malloc_using_checking = getenv ("MALLOC_CHECK_") != NULL;
+    }
 }
 
 void (*__malloc_initialize_hook) () = malloc_initialize_hook;
@@ -810,6 +829,17 @@ main (argc, argv
   stack_base = &dummy;
 #endif
 
+  if (!initialized)
+    {
+      extern char my_endbss[];
+      extern char *my_endbss_static;
+
+      if (my_heap_start == 0)
+        my_heap_start = sbrk (0);
+
+      heap_bss_diff = (char *)my_heap_start - max (my_endbss, my_endbss_static);
+    }
+
 #ifdef LINUX_SBRK_BUG
   __sbrk (1);
 #endif
@@ -853,6 +883,28 @@ main (argc, argv
         }
     }
 
+#ifdef HAVE_PERSONALITY_LINUX32
+  /* See if there is a gap between the end of BSS and the heap.
+     In that case, set personality and exec ourself again.  */
+  if (!initialized
+      && (strcmp (argv[argc-1], "dump") == 0
+          || strcmp (argv[argc-1], "bootstrap") == 0)
+      && heap_bss_diff > MAX_HEAP_BSS_DIFF)
+    {
+      if (! getenv ("EMACS_HEAP_EXEC"))
+        {
+          /* Set this so we only do this once.  */
+          putenv("EMACS_HEAP_EXEC=true");
+          personality (PER_LINUX32);
+          execvp (argv[0], argv);
+
+          /* If the exec fails, try to dump anyway.  */
+          perror ("execvp");
+        }
+    }
+#endif /* HAVE_PERSONALITY_LINUX32 */
+
+
 /* Map in shared memory, if we are using that.  */
 #ifdef HAVE_SHM
   if (argmatch (argv, argc, "-nl", "--no-shared-memory", 6, NULL, &skip_args))
@@ -2129,6 +2181,17 @@ You must run Emacs in batch mode in order to dump it.  */)
   if (! noninteractive)
     error ("Dumping Emacs works only in batch mode");
 
+  if (heap_bss_diff > MAX_HEAP_BSS_DIFF)
+    {
+      fprintf (stderr, "**************************************************\n");
+      fprintf (stderr, "Warning: Your system has a gap between BSS and the\n");
+      fprintf (stderr, "heap.  This usually means that exec-shield or\n");
+      fprintf (stderr, "something similar is in effect.  The dump may fail\n");
+      fprintf (stderr, "because of this.  See the section about exec-shield\n");
+      fprintf (stderr, "in etc/PROBLEMS for more information.\n");
+      fprintf (stderr, "**************************************************\n");
+    }
+
   /* Bind `command-line-processed' to nil before dumping,
      so that the dumped Emacs will process its command line
      and set up to work with X windows if appropriate.  */
diff --git a/src/fontset.c b/src/fontset.c
index 7fbaee3c216..0c50be2d21e 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -790,16 +790,34 @@ fontset_pattern_regexp (pattern)
       || strcmp (SDATA (pattern), CACHED_FONTSET_NAME))
     {
       /* We must at first update the cached data.  */
-      char *regex = (char *) alloca (SCHARS (pattern) * 2 + 3);
-      char *p0, *p1 = regex;
+      char *regex, *p0, *p1;
+      int ndashes = 0, nstars = 0;
+      
+      for (p0 = SDATA (pattern); *p0; p0++)
+        {
+          if (*p0 == '-')
+            ndashes++;
+          else if (*p0 == '*')
+            nstars++;
+        }
+
+      /* If PATTERN is not full XLFD we conert "*" to ".*".  Otherwise
+         we convert "*" to "[^-]*" which is much faster in regular
+         expression matching.  */
+      if (ndashes < 14)
+        p1 = regex = (char *) alloca (SBYTES (pattern) + 2 * nstars + 1);
+      else
+        p1 = regex = (char *) alloca (SBYTES (pattern) + 5 * nstars + 1);
 
-      /* Convert "*" to ".*", "?" to ".".  */
       *p1++ = '^';
       for (p0 = (char *) SDATA (pattern); *p0; p0++)
         {
           if (*p0 == '*')
             {
-              *p1++ = '.';
+              if (ndashes < 14)
+                *p1++ = '.';
+              else
+                *p1++ = '[', *p1++ = '^', *p1++ = '-', *p1++ = ']';
               *p1++ = '*';
             }
           else if (*p0 == '?')
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 4d166a4d01e..8182ff45766 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -550,24 +550,6 @@ xg_resize_outer_widget (f, columns, rows)
   gdk_window_process_all_updates ();
 }
 
-/* This gets called after the frame F has been cleared.  Since that is
-   done with X calls, we need to redraw GTK widget (scroll bars).  */
-void
-xg_frame_cleared (f)
-     FRAME_PTR f;
-{
-  GtkWidget *w = f->output_data.x->widget;
-
-  if (w)
-    {
-      gtk_container_set_reallocate_redraws (GTK_CONTAINER (w), TRUE);
-      gtk_container_foreach (GTK_CONTAINER (w),
-                             (GtkCallback) gtk_widget_queue_draw,
-                             0);
-      gdk_window_process_all_updates ();
-    }
-}
-
 /* Function to handle resize of our widgets.  Since Emacs has some layouts
    that does not fit well with GTK standard containers, we do most layout
    manually.
@@ -585,8 +567,10 @@ xg_resize_widgets (f, pixelwidth, pixelheight)
   int columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth);
 
   if (FRAME_GTK_WIDGET (f)
-      && (columns != FRAME_COLS (f) || rows != FRAME_LINES (f)
-          || pixelwidth != FRAME_PIXEL_WIDTH (f) || pixelheight != FRAME_PIXEL_HEIGHT (f)))
+      && (columns != FRAME_COLS (f) 
+          || rows != FRAME_LINES (f)
+          || pixelwidth != FRAME_PIXEL_WIDTH (f) 
+          || pixelheight != FRAME_PIXEL_HEIGHT (f)))
     {
       struct x_output *x = f->output_data.x;
       GtkAllocation all;
@@ -681,54 +665,6 @@ xg_pix_to_gcolor (w, pixel, c)
   gdk_colormap_query_color (map, pixel, c);
 }
 
-/* Turning off double buffering for our GtkFixed widget has the side
-   effect of turning it off also for its children (scroll bars).
-   But we want those to be double buffered to not flicker so handle
-   expose manually here.
-   WIDGET is the GtkFixed widget that gets exposed.
-   EVENT is the expose event.
-   USER_DATA is unused.
-
-   Return TRUE to tell GTK that this expose event has been fully handeled
-   and that GTK shall do nothing more with it.  */
-static gboolean
-xg_fixed_handle_expose (GtkWidget *widget,
-                        GdkEventExpose *event,
-                        gpointer user_data)
-{
-  GList *iter;
-
-  for (iter = GTK_FIXED (widget)->children; iter; iter = g_list_next (iter))
-    {
-      GtkFixedChild *child_data = (GtkFixedChild *) iter->data;
-      GtkWidget *child = child_data->widget;
-      GdkWindow *window = child->window;
-      GdkRegion *region = gtk_widget_region_intersect (child, event->region);
-
-      if (! gdk_region_empty (region))
-        {
-          GdkEvent child_event;
-          child_event.expose = *event;
-          child_event.expose.region = region;
-
-          /* Turn on double buffering, i.e. draw to an off screen area.  */
-          gdk_window_begin_paint_region (window, region);
-
-          /* Tell child to redraw itself.  */
-          gdk_region_get_clipbox (region, &child_event.expose.area);
-          gtk_widget_send_expose (child, &child_event);
-          gdk_window_process_updates (window, TRUE);
-
-          /* Copy off screen area to the window.  */
-          gdk_window_end_paint (window);
-        }
-
-      gdk_region_destroy (region);
-     }
-
-  return TRUE;
-}
-
 /* Create and set up the GTK widgets for frame F.
    Return 0 if creation failed, non-zero otherwise.  */
 int
@@ -804,12 +740,6 @@ xg_create_frame_widgets (f)
      a lot, so we turn off double buffering.  */
   gtk_widget_set_double_buffered (wfixed, FALSE);
 
-  /* Turning off double buffering above has the side effect of turning
-     it off also for its children (scroll bars).  But we want those
-     to be double buffered to not flicker so handle expose manually.  */
-  g_signal_connect (G_OBJECT (wfixed), "expose-event",
-                    G_CALLBACK (xg_fixed_handle_expose), 0);
-
   /* GTK documents says use gtk_window_set_resizable.  But then a user
      can't shrink the window from its starting size.  */
   gtk_window_set_policy (GTK_WINDOW (wtop), TRUE, TRUE, TRUE);
@@ -2770,6 +2700,7 @@ xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name)
      char *scroll_bar_name;
 {
   GtkWidget *wscroll;
+  GtkWidget *webox;
   GtkObject *vadj;
   int scroll_id;
 
@@ -2779,6 +2710,7 @@ xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name)
                              0.1, 0.1, 0.1);
 
   wscroll = gtk_vscrollbar_new (GTK_ADJUSTMENT (vadj));
+  webox = gtk_event_box_new ();
   gtk_widget_set_name (wscroll, scroll_bar_name);
   gtk_range_set_update_policy (GTK_RANGE (wscroll), GTK_UPDATE_CONTINUOUS);
 
@@ -2804,11 +2736,18 @@ xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name)
                     G_CALLBACK (scroll_bar_button_cb),
                     (gpointer) bar);
 
-  gtk_fixed_put (GTK_FIXED (f->output_data.x->edit_widget),
-                 wscroll, -1, -1);
+  /* The scroll bar widget does not draw on a window of its own.  Instead
+     it draws on the parent window, in this case the edit widget.  So
+     whenever the edit widget is cleared, the scroll bar needs to redraw
+     also, which causes flicker.  Put an event box between the edit widget
+     and the scroll bar, so the scroll bar instead draws itself on the
+     event box window.  */
+  gtk_fixed_put (GTK_FIXED (f->output_data.x->edit_widget), webox, -1, -1);
+  gtk_container_add (GTK_CONTAINER (webox), wscroll);
+  
 
   /* Set the cursor to an arrow.  */
-  xg_set_cursor (wscroll, FRAME_X_DISPLAY_INFO (f)->xg_cursor);
+  xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor);
 
   SET_SCROLL_BAR_X_WINDOW (bar, scroll_id);
 }
@@ -2820,7 +2759,7 @@ xg_show_scroll_bar (scrollbar_id)
 {
   GtkWidget *w = xg_get_widget_from_map (scrollbar_id);
   if (w)
-    gtk_widget_show (w);
+    gtk_widget_show_all (gtk_widget_get_parent (w));
 }
 
 /* Remove the scroll bar represented by SCROLLBAR_ID from the frame F.  */
@@ -2832,42 +2771,19 @@ xg_remove_scroll_bar (f, scrollbar_id)
   GtkWidget *w = xg_get_widget_from_map (scrollbar_id);
   if (w)
     {
+      GtkWidget *wparent = gtk_widget_get_parent (w);
       gtk_widget_destroy (w);
+      gtk_widget_destroy (wparent);
       SET_FRAME_GARBAGED (f);
     }
 }
 
-/* Find left/top for widget W in GtkFixed widget WFIXED.  */
-static void
-xg_find_top_left_in_fixed (w, wfixed, left, top)
-     GtkWidget *w, *wfixed;
-     int *left, *top;
-{
-  GList *iter;
-
-  for (iter = GTK_FIXED (wfixed)->children; iter; iter = g_list_next (iter))
-    {
-      GtkFixedChild *child = (GtkFixedChild *) iter->data;
-
-      if (child->widget == w)
-        {
-          *left = child->x;
-          *top = child->y;
-          return;
-        }
-    }
-
-  /* Shall never end up here.  */
-  abort ();
-}
-
 /* Update the position of the vertical scroll bar represented by SCROLLBAR_ID
    in frame F.
    TOP/LEFT are the new pixel positions where the bar shall appear.
    WIDTH, HEIGHT is the size in pixels the bar shall have.  */
 void
-xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height,
-                         real_left, canon_width)
+xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height)
      FRAME_PTR f;
      int scrollbar_id;
      int top;
@@ -2881,44 +2797,12 @@ xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height,
   if (wscroll)
     {
       GtkWidget *wfixed = f->output_data.x->edit_widget;
-
-      gtk_container_set_reallocate_redraws (GTK_CONTAINER (wfixed), TRUE);
+      GtkWidget *wparent = gtk_widget_get_parent (wscroll);
 
       /* Move and resize to new values.  */
-      gtk_fixed_move (GTK_FIXED (wfixed), wscroll, left, top);
       gtk_widget_set_size_request (wscroll, width, height);
+      gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top);
 
-      /* Scroll bars in GTK has a fixed width, so if we say width 16, it
-         will only be its fixed width (14 is default) anyway, the rest is
-         blank.  We are drawing the mode line across scroll bars when
-         the frame is split:
-                               |bar| |fringe|
-                              ----------------
-                              mode line
-                              ----------------
-                               |bar| |fringe|
-
-         When we "unsplit" the frame:
-
-                               |bar| |fringe|
-                              -|   |-|      |
-                              m¦   |i|      |
-                              -|   |-|      |
-                               |   | |      |
-
-
-         the remains of the mode line can be seen in these blank spaces.
-         So we must clear them explicitly.
-         GTK scroll bars should do that, but they don't.
-         Also, the canonical width may be wider than the width for the
-         scroll bar so that there is some space (typically 1 pixel) between
-         the scroll bar and the edge of the window and between the scroll
-         bar and the fringe.  */
-      gdk_window_clear (wscroll->window);
-
-      /* Must force out update so changed scroll bars gets redrawn.  */
-      gdk_window_process_all_updates ();
-      
       SET_FRAME_GARBAGED (f);
       cancel_mouse_face (f);
     }
diff --git a/src/gtkutil.h b/src/gtkutil.h
index b35ab94b2cb..c0055f361cc 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -168,9 +168,7 @@ extern void xg_update_scrollbar_pos P_ ((FRAME_PTR f,
                                          int top,
                                          int left,
                                          int width,
-                                         int height,
-                                         int real_left,
-                                         int canon_width));
+                                         int height));
 
 extern void xg_set_toolkit_scroll_bar_thumb P_ ((struct scroll_bar *bar,
                                                  int portion,
@@ -184,7 +182,6 @@ extern void free_frame_tool_bar P_ ((FRAME_PTR f));
 extern void xg_resize_widgets P_ ((FRAME_PTR f,
                                    int pixelwidth,
                                    int pixelheight));
-extern void xg_frame_cleared P_ ((FRAME_PTR f));
 extern void xg_frame_set_char_size P_ ((FRAME_PTR f, int cols, int rows));
 extern GtkWidget * xg_win_to_widget P_ ((Display *dpy, Window wdesc));
 
diff --git a/src/lastfile.c b/src/lastfile.c
index df678b42876..d6292e30040 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -40,7 +40,6 @@ Boston, MA 02111-1307, USA.  */
 
 char my_edata[] = "End of Emacs initialized data";
 
-#if defined(WINDOWSNT) || defined(CYGWIN)
 /* Help unexec locate the end of the .bss area used by Emacs (which
    isn't always a separate section in NT executables).  */
 char my_endbss[1];
@@ -50,7 +49,6 @@ char my_endbss[1];
    of the bss area used by Emacs.  */
 static char _my_endbss[1];
 char * my_endbss_static = _my_endbss;
-#endif
 
 /* arch-tag: 67e81ab4-e14f-44b2-8875-c0c12252223e
    (do not change this comment) */
diff --git a/src/regex.c b/src/regex.c
index 31a10ee92e0..36787238a32 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -1283,6 +1283,7 @@ static const char *re_error_msgid[] =
     gettext_noop ("Premature end of regular expression"), /* REG_EEND */
     gettext_noop ("Regular expression too big"), /* REG_ESIZE */
     gettext_noop ("Unmatched ) or \\)"), /* REG_ERPAREN */
+    gettext_noop ("Range striding over charsets") /* REG_ERANGEX  */
   };
 
 /* Avoiding alloca during matching, to placate r_alloc.  */
@@ -2871,7 +2872,7 @@ regex_compile (pattern, size, syntax, bufp)
                           }
                       }
                     else if (!SAME_CHARSET_P (c, c1))
-                      FREE_STACK_RETURN (REG_ERANGE);
+                      FREE_STACK_RETURN (REG_ERANGEX);
                   }
                 else
                   /* Range from C to C. */
diff --git a/src/regex.h b/src/regex.h
index f969c9c5e74..2cdb02993b1 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -316,7 +316,8 @@ typedef enum
   /* Error codes we've added.  */
   REG_EEND,             /* Premature end.  */
   REG_ESIZE,            /* Compiled pattern bigger than 2^16 bytes.  */
-  REG_ERPAREN           /* Unmatched ) or \); not returned from regcomp.  */
+  REG_ERPAREN,          /* Unmatched ) or \); not returned from regcomp.  */
+  REG_ERANGEX           /* Range striding over charsets.  */
 } reg_errcode_t;
 
 /* This data structure represents a compiled pattern.  Before calling
diff --git a/src/w32.c b/src/w32.c
index 12d1f21b091..7b54924d736 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1005,6 +1005,32 @@ init_environment (char ** argv)
           _snprintf (buf, sizeof(buf)-1, "emacs_dir=%s", modname);
           _putenv (strdup (buf));
         }
+      /* Handle running emacs from the build directory: src/oo-spd/i386/  */
+
+      /* FIXME: should use substring of get_emacs_configuration ().
+         But I don't think the Windows build supports alpha, mips etc
+         anymore, so have taken the easy option for now.  */
+      else if (p && stricmp (p, "\\i386") == 0)
+        {
+          *p = 0;
+          p = strrchr (modname, '\\');
+          if (p != NULL)
+            {
+              *p = 0;
+              p = strrchr (modname, '\\');
+              if (p && stricmp (p, "\\src") == 0)
+                {
+                  char buf[SET_ENV_BUF_SIZE];
+
+                  *p = 0;
+                  for (p = modname; *p; p++)
+                    if (*p == '\\') *p = '/';
+
+                  _snprintf (buf, sizeof(buf)-1, "emacs_dir=%s", modname);
+                  _putenv (strdup (buf));
+                }
+            }
+        }
     }
 
     for (i = 0; i < (sizeof (env_vars) / sizeof (env_vars[0])); i++)
diff --git a/src/w32term.c b/src/w32term.c
index 9238b7959d5..8db94ceb759 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2516,7 +2516,7 @@ x_draw_glyph_string (s)
         }
           else
             {
-              w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x,
+              w32_fill_area (s->f, s->hdc, s->face->overline_color, s->x,
                              s->y + dy, s->width, h);
             }
         }
diff --git a/src/xdisp.c b/src/xdisp.c
index 81a535f6b0e..47b4bc1f06d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7974,7 +7974,7 @@ store_frame_title (str, field_width, precision)
 
   /* Copy at most PRECISION chars from STR.  */
   nbytes = strlen (str);
-  n+= c_string_width (str, nbytes, precision, &dummy, &nbytes);
+  n += c_string_width (str, nbytes, precision, &dummy, &nbytes);
   while (nbytes--)
     store_frame_title_char (*str++);
 
@@ -15459,14 +15459,15 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
 
             if (this - 1 != last)
               {
+                int nchars, nbytes;
+
                 /* Output to end of string or up to '%'.  Field width
                    is length of string.  Don't output more than
                    PRECISION allows us.  */
                 --this;
 
-                prec = chars_in_text (last, this - last);
-                if (precision > 0 && prec > precision - n)
-                  prec = precision - n;
+                prec = c_string_width (last, this - last, precision - n,
+                                       &nchars, &nbytes);
 
                 if (frame_title_ptr)
                   n += store_frame_title (last, 0, prec);
@@ -15474,9 +15475,12 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
                   {
                     int bytepos = last - lisp_string;
                     int charpos = string_byte_to_char (elt, bytepos);
+                    int endpos = (precision <= 0 ? SCHARS (elt)
+                                  : charpos + nchars);
+
                     n += store_mode_line_string (NULL,
                                                  Fsubstring (elt, make_number (charpos),
-                                                             make_number (charpos + prec)),
+                                                             make_number (endpos)),
                                                  0, 0, 0, Qnil);
                   }
                 else
diff --git a/src/xfns.c b/src/xfns.c
index 115a5aeb3c5..97a55869a05 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1951,29 +1951,85 @@ static XIMStyle supported_xim_styles[] =
 };
 
 
-/* Create an X fontset on frame F with base font name
-   BASE_FONTNAME.. */
+/* Create an X fontset on frame F with base font name BASE_FONTNAME.  */
 
 static XFontSet
 xic_create_xfontset (f, base_fontname)
      struct frame *f;
      char *base_fontname;
 {
-  XFontSet xfs;
-  char **missing_list;
+  XFontSet xfs = NULL;
+  char **missing_list = NULL;
   int missing_count;
   char *def_string;
+  Lisp_Object rest, frame;
+
+  /* See if there is another frame already using same fontset.  */
+  FOR_EACH_FRAME (rest, frame)
+    {
+      struct frame *cf = XFRAME (frame);
+      if (cf != f && FRAME_LIVE_P (f) && FRAME_X_P (cf)
+          && FRAME_X_DISPLAY_INFO (cf) == FRAME_X_DISPLAY_INFO (f)
+          && !strcmp (FRAME_XIC_BASE_FONTNAME (cf), base_fontname))
+        {
+          xfs = FRAME_XIC_FONTSET (cf);
+          break;
+        }
+    }
+
+  if (!xfs)
+    {
+      /* New fontset.  */
+      xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
+                            base_fontname, &missing_list,
+                            &missing_count, &def_string);
+      if (missing_list)
+        XFreeStringList (missing_list);
+    }
 
-  xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
-                        base_fontname, &missing_list,
-                        &missing_count, &def_string);
-  if (missing_list)
-    XFreeStringList (missing_list);
+  if (FRAME_XIC_BASE_FONTNAME (f))
+    xfree (FRAME_XIC_BASE_FONTNAME (f));
+  FRAME_XIC_BASE_FONTNAME (f) = xstrdup (base_fontname);
 
-  /* No need to free def_string. */
+  /* No need to free def_string.  */
   return xfs;
 }
 
+/* Free the X fontset of frame F if it is the last frame using it.  */
+
+void
+xic_free_xfontset (f)
+     struct frame *f;
+{
+  Lisp_Object rest, frame;
+  int shared_p = 0;
+
+  if (!FRAME_XIC_FONTSET (f))
+    return;
+
+  /* See if there is another frame sharing the same fontset.  */
+  FOR_EACH_FRAME (rest, frame)
+    {
+      struct frame *cf = XFRAME (frame);
+      if (cf != f && FRAME_LIVE_P (f) && FRAME_X_P (cf)
+          && FRAME_X_DISPLAY_INFO (cf) == FRAME_X_DISPLAY_INFO (f)
+          && FRAME_XIC_FONTSET (cf) == FRAME_XIC_FONTSET (f))
+        {
+          shared_p = 1;
+          break;
+        }
+    }
+
+  if (!shared_p)
+    /* The fontset is not used anymore.  It is safe to free it.  */
+    XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f));
+
+  if (FRAME_XIC_BASE_FONTNAME (f))
+    xfree (FRAME_XIC_BASE_FONTNAME (f));
+  FRAME_XIC_BASE_FONTNAME (f) = NULL;
+  FRAME_XIC_FONTSET (f) = NULL;
+}
+
 
 /* Value is the best input style, given user preferences USER (already
    checked to be supported by Emacs), and styles supported by the
@@ -2124,11 +2180,9 @@ free_frame_xic (f)
     return;
 
   XDestroyIC (FRAME_XIC (f));
-  if (FRAME_XIC_FONTSET (f))
-    XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f));
+  xic_free_xfontset (f);
 
   FRAME_XIC (f) = NULL;
-  FRAME_XIC_FONTSET (f) = NULL;
 }
 
 
@@ -2207,6 +2261,8 @@ xic_set_xfontset (f, base_fontname)
   XVaNestedList attr;
   XFontSet xfs;
 
+  xic_free_xfontset (f);
+
   xfs = xic_create_xfontset (f, base_fontname);
 
   attr = XVaCreateNestedList (0, XNFontSet, xfs, NULL);
@@ -2216,8 +2272,6 @@ xic_set_xfontset (f, base_fontname)
     XSetICValues (FRAME_XIC (f), XNStatusAttributes, attr, NULL);
   XFree (attr);
 
-  if (FRAME_XIC_FONTSET (f))
-    XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f));
   FRAME_XIC_FONTSET (f) = xfs;
 }
 
diff --git a/src/xterm.c b/src/xterm.c
index 2ce8b7d7759..492e8d00b52 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2819,10 +2819,6 @@ x_clear_frame (struct frame *f)
 
   XFlush (FRAME_X_DISPLAY (f));
 
-#ifdef USE_GTK
-  xg_frame_cleared (f);
-#endif
-
   UNBLOCK_INPUT;
 }
 
@@ -4865,9 +4861,7 @@ x_scroll_bar_create (w, top, left, width, height)
                              top,
                              left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
                              width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
-                             max (height, 1),
-                             left,
-                             width);
+                             max (height, 1));
     xg_show_scroll_bar (SCROLL_BAR_X_WINDOW (bar));
 #else /* not USE_GTK */
     Widget scroll_bar = SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar);
@@ -5111,18 +5105,6 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
 
 #ifdef USE_TOOLKIT_SCROLL_BARS
 
-#ifdef USE_GTK
-      if (mask)
-        xg_update_scrollbar_pos (f,
-                                 SCROLL_BAR_X_WINDOW (bar),
-                                 top,
-                                 sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
-                                 sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
-                                 max (height, 1),
-                                 left,
-                                 width);
-#else /* not USE_GTK */
-
       /* Move/size the scroll bar widget.  */
       if (mask)
         {
@@ -5131,13 +5113,21 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
           if (width > 0 && height > 0)
             x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                           left, top, width, height, False);
+#ifdef USE_GTK
+          xg_update_scrollbar_pos (f,
+                                   SCROLL_BAR_X_WINDOW (bar),
+                                   top,
+                                   sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+                                   sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM *2,
+                                   max (height, 1));
+#else /* not USE_GTK */
           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 */
 
       /* Clear areas not covered by the scroll bar because of
@@ -8031,11 +8021,7 @@ xim_destroy_callback (xim, client_data, call_data)
       if (FRAME_X_P (f) && FRAME_X_DISPLAY_INFO (f) == dpyinfo)
         {
           FRAME_XIC (f) = NULL;
-          if (FRAME_XIC_FONTSET (f))
-            {
-              XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f));
-              FRAME_XIC_FONTSET (f) = NULL;
-            }
+          xic_free_xfontset (f);
         }
     }
 
diff --git a/src/xterm.h b/src/xterm.h
index bb1fe9ddc4c..eebe4f10878 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -50,7 +50,9 @@ typedef Widget xt_or_gtk_widget;
 typedef GtkWidget *xt_or_gtk_widget;
 #define XtParent(x) (gtk_widget_get_parent (x))
 #undef XSync
-#define XSync(d, b) gdk_window_process_all_updates ()
+#define XSync(d, b) do { gdk_window_process_all_updates (); \
+                         XSync (d, b);  } while (0)
+     
 
 #endif /* USE_GTK */
 
@@ -601,6 +603,7 @@ struct x_output
   XIC xic;
   XIMStyle xic_style;
   XFontSet xic_xfs;
+  char *xic_base_fontname;
 #endif
 
   /* Relief GCs, colors etc.  */
@@ -735,6 +738,7 @@ enum
 #define FRAME_X_XIM_STYLES(f) (FRAME_X_DISPLAY_INFO (f)->xim_styles)
 #define FRAME_XIC_STYLE(f) ((f)->output_data.x->xic_style)
 #define FRAME_XIC_FONTSET(f) ((f)->output_data.x->xic_xfs)
+#define FRAME_XIC_BASE_FONTNAME(f) ((f)->output_data.x->xic_base_fontname)
 
 /* Value is the smallest width of any character in any font on frame F.  */
 
@@ -1044,6 +1048,7 @@ extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object))
 extern unsigned char * x_encode_text P_ ((Lisp_Object, Lisp_Object, int,
                                           int *, int *));
 extern void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
+extern void xic_free_xfontset P_ ((struct frame *));
 extern void create_frame_xic P_ ((struct frame *));
 extern void destroy_frame_xic P_ ((struct frame *));
 extern void xic_set_preeditarea P_ ((struct window *, int, int));