Merged from miles@gnu.org--gnu-2005 (patch 142-148, 615-628)

Patches applied:

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-616
   Add lisp/mh-e/.arch-inventory

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-624
   Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-142
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-143
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-144
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-145
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-146
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-147
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-148
   Update from CVS

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

14 files changed, 239 insertions, 62 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 213e7762485..61a10be80dd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,88 @@
+2005-10-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * data.c (Fmake_variable_frame_local): Add clarification to
+        docstring.
+
+        * fringe.c (update_window_fringes): Handle case where buffer ends
+        with a newline.
+
+2005-10-27  Kenichi Handa  <handa@m17n.org>
+
+        * coding.h (DECODE_SYSTEM): Fix argument name; name->str.
+
+2005-10-24  Kenichi Handa  <handa@m17n.org>
+
+        * charset.h (charset_mule_unicode_0100_24ff)
+        (charset_mule_unicode_2500_33ff, charset_mule_unicode_e000_ffff):
+        Extern them.
+
+        * charset.c (charset_mule_unicode_0100_24ff)
+        (charset_mule_unicode_2500_33ff, charset_mule_unicode_e000_ffff):
+        New variables.
+        (Fsetup_special_charsets): Initialize them.
+
+        * xterm.c (handle_one_xevent): Handle keysyms directly mapped to
+        supported Unicode characters.
+
+2005-10-25  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (w32_to_x_font): Avoid forcing font widths.
+
+2005-10-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * image.c [MAC_OS] (image_load_qt_1): Check image size.
+        Use GraphicsImportGetImageDescription instead of
+        GraphicsImportGetNaturalBounds.
+        [MAC_OSX] (image_load_quartz2d): Check image size.
+        [MAC_OS] (xpm_load_image): Likewise.
+
+        * macterm.c (last_mouse_glyph_frame): New var.
+        (note_mouse_movement): Say mouse moved if current frame differs
+        from last_mouse_glyph_frame, and update last_mouse_glyph_frame.
+        (XTmouse_position): Set last_mouse_glyph_frame.
+        (XTread_socket): Clear last_mouse_glyph_frame on mouse up/down event.
+        (mac_draw_string_common) [MAC_OSX && WORDS_BIG_ENDIAN]: Fix typo.
+        Use EndianU16_BtoN.
+        (mac_draw_string_common) [MAC_OSX]: Don't use ATSUClearLayoutControls.
+        (x_per_char_metric, XLoadQueryFont)
+        [MAC_OS_X_VERSION_MAX_ALLOWED < 1020]: Use device origins to get
+        glyph bounds.
+        (mac_to_x_fontname, mac_do_list_fonts)
+        (mac_initialize_display_info): Change screen resolutions to 72dpi.
+
+2005-10-25  Masatake YAMATO  <jet@gyve.org>
+
+        * minibuf.c (Fdisplay_completion_list): Small doc fix.
+
+2005-10-24  Kim F. Storm  <storm@cua.dk>
+
+        * xterm.c: Undo 2005-10-23 change.
+        (last_mouse_glyph_frame): New var.
+        (note_mouse_movement): Say mouse moved if current frame differs
+        from last_mouse_glyph_frame, and update last_mouse_glyph_frame.
+        (XTmouse_position): Set last_mouse_glyph_frame.
+        (handle_one_xevent): Clear last_mouse_glyph_frame [instead of
+        last_mouse_glyph] on mouse up/down event.
+
+        * editfns.c (Fcompare_buffer_substrings): Fix last change.
+
+2005-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * editfns.c (Fcompare_buffer_substrings): Handle multibyte chars.
+
+2005-10-23  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (note_mouse_movement): Always call note_mouse_highlight
+        so tool tips don't interfere with press on tool bar button.
+
+2005-10-23  Richard M. Stallman  <rms@gnu.org>
+
+        * casetab.c (Fset_case_table): Doc fix.
+
+        * lread.c (build_load_history): Replace STREAM arg with ENTIRE.
+        (readevalloop): Compute ENTIRE properly.
+        (syms_of_lread) <load-history>: Doc fix.
+
 2005-10-21  Richard M. Stallman  <rms@gnu.org>
 
         * lread.c (Fload): Simplify gcpro structure.
@@ -8,8 +93,7 @@
 
 2005-10-21  Kenichi Handa  <handa@m17n.org>
 
-        * search.c (boyer_moore): Surround the '||' part of expression in
-        `if' condition by parentheses explicitly.
+        * search.c (boyer_moore): Add parens to fix and/or precedence bug.
 
 2005-10-20  Kim F. Storm  <storm@cua.dk>
 
diff --git a/src/casetab.c b/src/casetab.c
index 874bb7599f0..a1e8b5a68fb 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -97,8 +97,9 @@ A case table is a char-table which maps characters
 to their lower-case equivalents.  It also has three \"extra\" slots
 which may be additional char-tables or nil.
 These slots are called UPCASE, CANONICALIZE and EQUIVALENCES.
-UPCASE maps each character to its upper-case equivalent;
- if lower and upper case characters are in 1-1 correspondence,
+UPCASE maps each non-upper-case character to its upper-case equivalent.
+ (The value in UPCASE for an upper-case character is never used.)
+ If lower and upper case characters are in 1-1 correspondence,
  you may use nil and the upcase table will be deduced from DOWNCASE.
 CANONICALIZE maps each character to a canonical equivalent;
  any two characters that are related by case-conversion have the same
diff --git a/src/charset.c b/src/charset.c
index 3676c9b8a71..b4f84a9e785 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -63,6 +63,9 @@ int charset_katakana_jisx0201;	/* JISX0201.Kana (Japanese Katakana) */
 int charset_latin_jisx0201;     /* JISX0201.Roman (Japanese Roman) */
 int charset_big5_1;             /* Big5 Level 1 (Chinese Traditional) */
 int charset_big5_2;             /* Big5 Level 2 (Chinese Traditional) */
+int charset_mule_unicode_0100_24ff;
+int charset_mule_unicode_2500_33ff;
+int charset_mule_unicode_e000_ffff;
 
 Lisp_Object Qcharset_table;
 
@@ -1688,6 +1691,12 @@ DEFUN ("setup-special-charsets", Fsetup_special_charsets,
   charset_latin_jisx0201 = charset_id_internal ("latin-jisx0201");
   charset_big5_1 = charset_id_internal ("chinese-big5-1");
   charset_big5_2 = charset_id_internal ("chinese-big5-2");
+  charset_mule_unicode_0100_24ff
+    = charset_id_internal ("mule-unicode-0100-24ff");
+  charset_mule_unicode_2500_33ff
+    = charset_id_internal ("mule-unicode-2500-33ff");
+  charset_mule_unicode_e000_ffff
+    = charset_id_internal ("mule-unicode-e000-ffff");
   return Qnil;
 }
 
diff --git a/src/charset.h b/src/charset.h
index a5cdca21bbb..b487e1d220e 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -129,6 +129,9 @@ extern int charset_katakana_jisx0201; /* JISX0201.Kana (Japanese Katakana) */
 extern int charset_latin_jisx0201; /* JISX0201.Roman (Japanese Roman) */
 extern int charset_big5_1;      /* Big5 Level 1 (Chinese Traditional) */
 extern int charset_big5_2;      /* Big5 Level 2 (Chinese Traditional) */
+extern int charset_mule_unicode_0100_24ff;
+extern int charset_mule_unicode_2500_33ff;
+extern int charset_mule_unicode_e000_ffff;
 
 /* Check if CH is an ASCII character or a base leading-code.
    Nowadays, any byte can be the first byte of a character in a
diff --git a/src/coding.h b/src/coding.h
index 158ebbf289f..42e73a36430 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -601,7 +601,7 @@ struct coding_system
 
 /* Decode the string STR using the specified coding system
    for system functions, if any.  */
-#define DECODE_SYSTEM(name)                                                \
+#define DECODE_SYSTEM(str)                                                 \
   (! NILP (Vlocale_coding_system)                                          \
    && !EQ (Vlocale_coding_system, make_number (0))                         \
    ? code_convert_string_norecord (str, Vlocale_coding_system, 0)          \
diff --git a/src/data.c b/src/data.c
index cb6c7d2c85c..9bb90ad2d6e 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1726,7 +1726,9 @@ it is in effect whenever the current buffer has no buffer-local binding.
 A frame-local binding is actually a frame parameter value;
 thus, any given frame has a local binding for VARIABLE if it has
 a value for the frame parameter named VARIABLE.  Return VARIABLE.
-See `modify-frame-parameters' for how to set frame parameters.  */)
+
+This function does not in itself create any frame-local bindings for
+VARIABLE.  See `modify-frame-parameters' for how to set frame parameters.  */)
      (variable)
      register Lisp_Object variable;
 {
diff --git a/src/editfns.c b/src/editfns.c
index c3982b10cea..e7b152726e3 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2472,9 +2472,9 @@ determines whether case is significant or ignored.  */)
 {
   register int begp1, endp1, begp2, endp2, temp;
   register struct buffer *bp1, *bp2;
-  register Lisp_Object *trt
+  register Lisp_Object trt
     = (!NILP (current_buffer->case_fold_search)
-       ? XCHAR_TABLE (current_buffer->case_canon_table)->contents : 0);
+       ? current_buffer->case_canon_table : Qnil);
   int chars = 0;
   int i1, i2, i1_byte, i2_byte;
 
@@ -2593,10 +2593,10 @@ determines whether case is significant or ignored.  */)
           i2++;
         }
 
-      if (trt)
+      if (!NILP (trt))
         {
-          c1 = XINT (trt[c1]);
-          c2 = XINT (trt[c2]);
+          c1 = CHAR_TABLE_TRANSLATE (trt, c1);
+          c2 = CHAR_TABLE_TRANSLATE (trt, c2);
         }
       if (c1 < c2)
         return make_number (- 1 - chars);
diff --git a/src/fringe.c b/src/fringe.c
index 25de5aa604e..34c58db3674 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -861,7 +861,7 @@ update_window_fringes (w, keep_current_p)
 
               if (!done_bot)
                 {
-                  if (MATRIX_ROW_END_CHARPOS (row) >= BUF_ZV (XBUFFER (w->buffer))
+                  if (row->ends_at_zv_p
                       && !MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row))
                     row->indicate_eob_p = !NILP (boundary_bot), done_bot = 1;
                   else if (y + row->height >= yb)
diff --git a/src/image.c b/src/image.c
index 1996d8477e9..fb3cdecaa54 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2291,6 +2291,7 @@ image_load_qt_1 (f, img, type, fss, dh)
   GraphicsImportComponent gi;
   Rect rect;
   int width, height;
+  ImageDescriptionHandle desc_handle;
   short draw_all_pixels;
   Lisp_Object specified_bg;
   XColor color;
@@ -2326,14 +2327,22 @@ image_load_qt_1 (f, img, type, fss, dh)
           goto error;
         }
     }
-  err = GraphicsImportGetNaturalBounds (gi, &rect);
-  if (err != noErr)
+  err = GraphicsImportGetImageDescription (gi, &desc_handle);
+  if (err != noErr || desc_handle == NULL)
     {
       image_error ("Error reading `%s'", img->spec, Qnil);
       goto error;
     }
-  width = img->width = rect.right - rect.left;
-  height = img->height = rect.bottom - rect.top;
+  width = img->width = (*desc_handle)->width;
+  height = img->height = (*desc_handle)->height;
+  DisposeHandle ((Handle)desc_handle);
+
+  if (!check_image_size (f, width, height))
+    {
+      image_error ("Invalid image size", Qnil, Qnil);
+      goto error;
+    }
+
   err = GraphicsImportDoesDrawAllPixels (gi, &draw_all_pixels);
 #if 0
   /* Don't check the error code here.  It may have an undocumented
@@ -2535,6 +2544,15 @@ image_load_quartz2d (f, img, png_p)
       image_error ("Error reading image `%s'", img->spec, Qnil);
       return 0;
     }
+  width = img->width = CGImageGetWidth (image);
+  height = img->height = CGImageGetHeight (image);
+
+  if (!check_image_size (f, width, height))
+    {
+      UNGCPRO;
+      image_error ("Invalid image size", Qnil, Qnil);
+      return 0;
+    }
 
   if (png_p)
     {
@@ -2548,8 +2566,7 @@ image_load_quartz2d (f, img, png_p)
           color.blue = BLUE16_FROM_ULONG (color.pixel);
         }
     }
-  width = img->width = CGImageGetWidth (image);
-  height = img->height = CGImageGetHeight (image);
+
   if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
     {
       CGImageRelease (image);
@@ -4190,6 +4207,13 @@ xpm_load_image (f, img, contents, end)
       || width <= 0 || height <= 0
       || num_colors <= 0 || chars_per_pixel <= 0)
     goto failure;
+
+  if (!check_image_size (f, width, height))
+    {
+      image_error ("Invalid image size", Qnil, Qnil);
+      goto failure;
+    }
+
   expect (',');
 
   XSETFRAME (frame, f);
diff --git a/src/lread.c b/src/lread.c
index 43c7bf6cfc2..d51e6443288 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1199,33 +1199,34 @@ openp (path, str, suffixes, storeptr, predicate)
 
 /* Merge the list we've accumulated of globals from the current input source
    into the load_history variable.  The details depend on whether
-   the source has an associated file name or not. */
+   the source has an associated file name or not.
+
+   FILENAME is the file name that we are loading from.
+   ENTIRE is 1 if loading that entire file, 0 if evaluating part of it.  */
 
 static void
-build_load_history (stream, source)
-     FILE *stream;
-     Lisp_Object source;
+build_load_history (filename, entire)
+     Lisp_Object filename;
+     int entire;
 {
   register Lisp_Object tail, prev, newelt;
   register Lisp_Object tem, tem2;
-  register int foundit, loading;
-
-  loading = stream || !NARROWED;
+  register int foundit = 0;
 
   tail = Vload_history;
   prev = Qnil;
-  foundit = 0;
+
   while (CONSP (tail))
     {
       tem = XCAR (tail);
 
       /* Find the feature's previous assoc list... */
-      if (!NILP (Fequal (source, Fcar (tem))))
+      if (!NILP (Fequal (filename, Fcar (tem))))
         {
           foundit = 1;
 
-          /*  If we're loading, remove it. */
-          if (loading)
+          /*  If we're loading the entire file, remove old data. */
+          if (entire)
             {
               if (NILP (prev))
                 Vload_history = XCDR (tail);
@@ -1257,10 +1258,10 @@ build_load_history (stream, source)
       QUIT;
     }
 
-  /* If we're loading, cons the new assoc onto the front of load-history,
-     the most-recently-loaded position.  Also do this if we didn't find
-     an existing member for the current source.  */
-  if (loading || !foundit)
+  /* If we're loading an entire file, cons the new assoc onto the
+     front of load-history, the most-recently-loaded position.  Also
+     do this if we didn't find an existing member for the file.  */
+  if (entire || !foundit)
     Vload_history = Fcons (Fnreverse (Vcurrent_load_list),
                            Vload_history);
 }
@@ -1415,7 +1416,9 @@ readevalloop (readcharfun, stream, sourcename, evalfun,
         }
     }
 
-  build_load_history (stream, sourcename);
+  build_load_history (sourcename, 
+                      stream || (start == BEG && end == Z));
+
   UNGCPRO;
 
   unbind_to (count, Qnil);
@@ -3897,8 +3900,8 @@ An element `(t . SYMBOL)' precedes an entry `(defun . FUNCTION)',
 and means that SYMBOL was an autoload before this file redefined it
 as a function.
 
-For a preloaded file, the file name recorded is relative to the main Lisp
-directory.  These names are converted to absolute by `file-loadhist-lookup'.  */);
+During preloading, the file name recorded is relative to the main Lisp
+directory.  These file names are converted to absolute at startup.  */);
   Vload_history = Qnil;
 
   DEFVAR_LISP ("load-file-name", &Vload_file_name,
diff --git a/src/macterm.c b/src/macterm.c
index a4fe2342a63..70120bdf59d 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -165,6 +165,7 @@ struct frame *pending_autoraise_frame;
 /* Where the mouse was last time we reported a mouse event.  */
 
 static Rect last_mouse_glyph;
+static FRAME_PTR last_mouse_glyph_frame;
 
 /* The scroll bar in which the last X motion event occurred.
 
@@ -716,10 +717,10 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, mode, bytes_per_char)
 #ifndef WORDS_BIG_ENDIAN
       {
         int i;
-        Unichar *text = (Unichar *)buf;
+        UniChar *text = (UniChar *)buf;
 
         for (i = 0; i < nchars; i++)
-          text[i] = buf[2*i] << 8 | buf[2*i+1];
+          text[i] = EndianU16_BtoN (text[i]);
       }
 #endif
       err = atsu_get_text_layout_with_text_ptr ((ConstUniCharArrayPtr)buf,
@@ -773,11 +774,18 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, mode, bytes_per_char)
                 ATSUDrawText (text_layout,
                               kATSUFromTextBeginning, kATSUToTextEnd,
                               Long2Fix (x), Long2Fix (port_height - y));
-              ATSUClearLayoutControls (text_layout,
-                                       sizeof (tags) / sizeof (tags[0]),
-                                       tags);
               CGContextSynchronize (context);
               QDEndCGContext (port, &context);
+#if 0
+              /* This doesn't work on Mac OS X 10.1.  */
+              ATSUClearLayoutControls (text_layout, 
+                                       sizeof (tags) / sizeof (tags[0]),
+                                       tags);
+#else
+              ATSUSetLayoutControls (text_layout,
+                                     sizeof (tags) / sizeof (tags[0]),
+                                     tags, sizes, values);
+#endif
             }
 #endif
         }
@@ -1666,8 +1674,12 @@ x_per_char_metric (font, char2b)
           if (err == noErr)
             err = ATSUGetGlyphBounds (text_layout, 0, 0,
                                       kATSUFromTextBeginning, kATSUToTextEnd,
-                                      kATSUseFractionalOrigins, 1,
-                                      &glyph_bounds, NULL);
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
+                                      kATSUseFractionalOrigins,
+#else
+                                      kATSUseDeviceOrigins,
+#endif
+                                      1, &glyph_bounds, NULL);
           UNBLOCK_INPUT;
           if (err != noErr)
             pcm = NULL;
@@ -3910,13 +3922,15 @@ note_mouse_movement (frame, pos)
       return 1;
     }
   /* Has the mouse moved off the glyph it was on at the last sighting?  */
-  if (!PtInRect (*pos, &last_mouse_glyph))
+  if (frame != last_mouse_glyph_frame
+      || !PtInRect (*pos, &last_mouse_glyph))
     {
       frame->mouse_moved = 1;
       last_mouse_scroll_bar = Qnil;
       note_mouse_highlight (frame, pos->h, pos->v);
       /* Remember which glyph we're now on.  */
       remember_mouse_glyph (frame, pos->h, pos->v, &last_mouse_glyph);
+      last_mouse_glyph_frame = frame;
       return 1;
     }
 
@@ -4021,6 +4035,7 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time)
           GetMouse (&mouse_pos);
           remember_mouse_glyph (f1, mouse_pos.h, mouse_pos.v,
                                 &last_mouse_glyph);
+          last_mouse_glyph_frame = f1;
 
           *bar_window = Qnil;
           *part = 0;
@@ -6572,7 +6587,7 @@ mac_to_x_fontname (name, size, style, charset)
 
   sprintf (xf, "%s-%c-normal--%d-%d-%d-%d-m-%d-%s",
            style & bold ? "bold" : "medium", style & italic ? 'i' : 'r',
-           size, size * 10, size ? 75 : 0, size ? 75 : 0, size * 10, charset);
+           size, size * 10, size ? 72 : 0, size ? 72 : 0, size * 10, charset);
 
   result = xmalloc (strlen (foundry) + strlen (family) + strlen (xf) + 3 + 1);
   sprintf (result, "-%s-%s-%s", foundry, family, xf);
@@ -7061,7 +7076,7 @@ mac_do_list_fonts (pattern, maxnames)
             continue;
           memcpy (scaled, font_name_table[i], former_len);
           sprintf (scaled + former_len,
-                   "-%d-%d-75-75-m-%d-%s",
+                   "-%d-%d-72-72-m-%d-%s",
                    scl_val[XLFD_SCL_PIXEL_SIZE],
                    scl_val[XLFD_SCL_POINT_SIZE],
                    scl_val[XLFD_SCL_AVGWIDTH],
@@ -7409,8 +7424,12 @@ XLoadQueryFont (Display *dpy, char *fontname)
           if (err == noErr)
             err = ATSUGetGlyphBounds (text_layout, 0, 0,
                                       kATSUFromTextBeginning, kATSUToTextEnd,
-                                      kATSUseFractionalOrigins, 1,
-                                      &glyph_bounds, NULL);
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
+                                      kATSUseFractionalOrigins,
+#else
+                                      kATSUseDeviceOrigins,
+#endif
+                                      1, &glyph_bounds, NULL);
           if (err == noErr)
             {
               xassert (glyph_bounds.lowerRight.x - glyph_bounds.lowerLeft.x
@@ -9501,6 +9520,7 @@ XTread_socket (sd, expected, hold_quit)
                 != eventNotHandledErr)
               break;
 #endif
+            last_mouse_glyph_frame = 0;
 
             if (dpyinfo->grabbed && last_mouse_frame
                 && FRAME_LIVE_P (last_mouse_frame))
@@ -10230,8 +10250,8 @@ mac_initialize_display_info ()
   main_device_handle = LMGetMainDevice();
 
   dpyinfo->reference_count = 0;
-  dpyinfo->resx = 75.0;
-  dpyinfo->resy = 75.0;
+  dpyinfo->resx = 72.0;
+  dpyinfo->resy = 72.0;
   dpyinfo->color_p = TestDeviceAttribute (main_device_handle, gdDevType);
 #ifdef MAC_OSX
   /* HasDepth returns true if it is possible to have a 32 bit display,
diff --git a/src/minibuf.c b/src/minibuf.c
index cdee2ad8300..71a0f15b72a 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2369,7 +2369,7 @@ properties of `highlight'.
 At the end, this runs the normal hook `completion-setup-hook'.
 It can find the completion buffer in `standard-output'.
 The optional second arg COMMON-SUBSTRING is a string.
-It is used to put faces, `completions-first-difference` and
+It is used to put faces, `completions-first-difference' and
 `completions-common-part' on the completion buffer. The
 `completions-common-part' face is put on the common substring
 specified by COMMON-SUBSTRING. If COMMON-SUBSTRING is nil,
diff --git a/src/w32fns.c b/src/w32fns.c
index 93469418137..e18ee3d43a9 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5284,9 +5284,13 @@ w32_to_x_font (lplogfont, lpxstr, len, specific_charset)
       strcpy (height_pixels, "*");
       strcpy (height_dpi, "*");
     }
+
+#if 0 /* Never put the width in the xfld. It fails on fonts with
+         double-width characters.  */
   if (lplogfont->lfWidth)
     sprintf (width_pixels, "%u", lplogfont->lfWidth * 10);
   else
+#endif
     strcpy (width_pixels, "*");
 
   _snprintf (lpxstr, len - 1,
diff --git a/src/xterm.c b/src/xterm.c
index 2aa1095f27c..1adcb4fb4d1 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -248,6 +248,7 @@ static unsigned long ignore_next_mouse_click_timeout;
 /* Where the mouse was last time we reported a mouse event.  */
 
 static XRectangle last_mouse_glyph;
+static FRAME_PTR last_mouse_glyph_frame;
 static Lisp_Object last_mouse_press_frame;
 
 /* The scroll bar in which the last X motion event occurred.
@@ -3602,20 +3603,24 @@ note_mouse_movement (frame, event)
       frame->mouse_moved = 1;
       last_mouse_scroll_bar = Qnil;
       note_mouse_highlight (frame, -1, -1);
+      last_mouse_glyph_frame = 0;
       return 1;
     }
 
+
   /* Has the mouse moved off the glyph it was on at the last sighting?  */
-  if (event->x < last_mouse_glyph.x
-           || event->x >= last_mouse_glyph.x + last_mouse_glyph.width
-           || event->y < last_mouse_glyph.y
-           || event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
+  if (frame != last_mouse_glyph_frame
+      || event->x < last_mouse_glyph.x
+      || event->x >= last_mouse_glyph.x + last_mouse_glyph.width
+      || event->y < last_mouse_glyph.y
+      || event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
     {
       frame->mouse_moved = 1;
       last_mouse_scroll_bar = Qnil;
       note_mouse_highlight (frame, event->x, event->y);
       /* Remember which glyph we're now on.  */
       remember_mouse_glyph (frame, event->x, event->y, &last_mouse_glyph);
+      last_mouse_glyph_frame = frame;
       return 1;
     }
 
@@ -3827,6 +3832,7 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time)
                the frame are divided into.  */
 
             remember_mouse_glyph (f1, win_x, win_y, &last_mouse_glyph);
+            last_mouse_glyph_frame = f1;
 
             *bar_window = Qnil;
             *part = 0;
@@ -6245,12 +6251,33 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
             {
               inev.ie.kind = ASCII_KEYSTROKE_EVENT;
               inev.ie.code = keysym;
-              goto done_keysym;
-            }
- 
-          /* Now non-ASCII.  */
-          if (HASH_TABLE_P (Vx_keysym_table)
-              && (NATNUMP (c = Fgethash (make_number (keysym),
+              goto done_keysym;
+            }
+
+          /* Keysyms directly mapped to supported Unicode characters.  */
+          if ((keysym >= 0x01000100 && keysym <= 0x010033ff)
+              || (keysym >= 0x0100e000 && keysym <= 0x0100ffff))
+            {
+              int code, charset_id, c1, c2;
+
+              if (keysym < 0x01002500)
+                charset_id = charset_mule_unicode_0100_24ff,
+                  code = (keysym & 0xFFFF) - 0x100;
+              else if (keysym < 0x0100e000)
+                charset_id = charset_mule_unicode_2500_33ff,
+                  code = (keysym & 0xFFFF) - 0x2500;
+              else
+                charset_id = charset_mule_unicode_e000_ffff,
+                  code = (keysym & 0xFFFF) - 0xe000;
+              c1 = (code / 96) + 32, c2 = (code % 96) + 32;
+              inev.ie.kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT;
+              inev.ie.code = MAKE_CHAR (charset_id, c1, c2);
+              goto done_keysym;
+            }
+
+          /* Now non-ASCII.  */
+          if (HASH_TABLE_P (Vx_keysym_table)
+              && (NATNUMP (c = Fgethash (make_number (keysym),
                                          Vx_keysym_table,
                                          Qnil))))
             {
@@ -6649,7 +6676,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
         int tool_bar_p = 0;
 
         bzero (&compose_status, sizeof (compose_status));
-        bzero (&last_mouse_glyph, sizeof (last_mouse_glyph));
+        last_mouse_glyph_frame = 0;
 
         if (dpyinfo->grabbed
             && last_mouse_frame