Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 320-342)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - lisp/play/cookie1.el (cookie): Work properly when there's only one entry
   - Add note about "link" button-class to etc/TODO

 * gnus--rel--5.10  (patch 108-112)

   - Merge from emacs--devo--0
   - Clean up merge mistakes
   - Update from CVS
   - Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86

24 files changed, 414 insertions, 91 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index dd848fed3d5..60730536ae9 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -217,6 +217,15 @@ define pitx
   printf " a+d=%d+%d=%d", $it->ascent, $it->descent, $it->ascent+$it->descent
   printf " max=%d+%d=%d", $it->max_ascent, $it->max_descent, $it->max_ascent+$it->max_descent
   printf "\n"
+  set $i = 0
+  while ($i < $it->sp)
+    set $e = $it->stack[$i]
+    printf "stack[%d]: ", $i
+    output $e->method
+    printf "[%d]", $e->position.charpos
+    printf "\n"
+    set $i = $i + 1
+  end
 end
 document pitx
 Pretty print a display iterator.
diff --git a/src/ChangeLog b/src/ChangeLog
index 3e523d28f8d..4b817c11eae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,144 @@
+2006-07-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
+        clash detection using the base buffer.
+
+        * puresize.h (BASE_PURESIZE): Increment to 1210500.
+
+2006-07-04  Kim F. Storm  <storm@cua.dk>
+
+        * xterm.c (x_delete_display): Don't free or derefence NULL pointers.
+
+2006-07-04  Kenichi Handa  <handa@m17n.org>
+
+        * fontset.c (Fset_overriding_fontspec_internal): Check if we need
+        to update Voverriding_fontspec_alist.
+
+2006-07-03  Richard Stallman  <rms@gnu.org>
+
+        * xfns.c (Fx_create_frame): Move unwind_create_frame setup down.
+
+        * xfaces.c (Fface_attribute_relative_p): Doc fix.
+
+        * textprop.c (Fget_char_property_and_overlay): Doc fix.
+
+        * eval.c (Fdefvaralias): Doc fix.
+
+2006-07-03  Kim F. Storm  <storm@cua.dk>
+
+        * dispnew.c (sit_for): Fix preempt condition.
+
+2006-07-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c (read_filtered_event): Treat select-window just like
+        switch-frame.
+
+2006-07-02  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (display_tool_bar_line): Skip glyphs which are too big
+        to ever fit the tool-bar,
+        (MAX_FRAME_TOOL_BAR_HEIGHT): New macro.
+        (tool_bar_lines_needed): Use unused mode-line row as temp_row.
+        (redisplay_tool_bar): Only clear desired matrix if we actually
+        change the tool-bar window height.  Only try to make the tool-bar
+        window bigger if there is actually room for it.
+
+2006-06-30  Ralf Angeli  <angeli@caeruleus.net>
+
+        * w32term.c (x_make_frame_visible): Use SystemParametersInfo with
+        SPI_GETWORKAREA to find the dimensions of the screen work area,
+        and adjust vertical position of the frame in order to avoid being
+        covered by the task bar.
+
+        * w32fns.c (w32_createwindow): Use CW_USEDEFAULT instead of
+        f->left_pos and SH_SHOW instead of f->top_pos in the call to
+        CreateWindow.  Record the actual position in f->left_pos and
+        f->top_pos.
+
+2006-06-30  John Paul Wallington  <jpw@pobox.com>
+
+        * w32console.c (syms_of_ntterm) <w32-use-full-screen-buffer>:
+        Doc fix - default value has changed.
+
+2006-06-28  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mac.c [!TARGET_API_MAC_CARBON]: Don't include FixMath.h or Scrap.h.
+
+        * macfns.c (Fx_create_frame): Apply 2006-06-24 change for xfns.c.
+
+        * macgui.h (USE_MAC_TSM) [TARGET_API_MAC_CARBON]: Set default to 1.
+
+        * macterm.c (Qeql): Add extern.
+        (x_set_mouse_pixel_position) [MAC_OSX]: Use CGWarpMouseCursorPosition.
+        (fm_style_face_attributes_alist) [USE_ATSUI]: New variable.
+        (syms_of_macterm) [USE_ATSUI]: Initialize and staticpro it.
+        Change keys of Vmac_atsu_font_table from strings to numbers.
+        (fm_style_to_face_attributes) [USE_ATSUI]: New function.
+        (init_font_name_table) [USE_ATSUI]: Use it.
+        (saved_ts_script_language_on_focus) [USE_MAC_TSM]: New variable.
+        (syms_of_macterm) [USE_MAC_TSM]: Initialize and staticpro it.
+        [USE_MAC_TSM] (mac_tsm_resume): Restore script and language codes
+        only when saved_ts_script_language_on_focus coincides with
+        Vmac_ts_script_language_on_focus.
+        [USE_MAC_TSM] (mac_tsm_suspend): Save value of
+        Vmac_ts_script_language_on_focus to saved_ts_script_language_on_focus.
+        (XTread_socket) [USE_MAC_TSM]: Add Mac OS Classic support.
+        [USE_MAC_TSM] (mac_handle_text_input_event, init_tsm): Likewise.
+
+2006-06-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * editfns.c (Fdelete_field, Ffield_string, Ffield_beginning)
+        (Ffield_string_no_properties, Ffield_end): Mention
+        args-out-of-range error condition in docstring.
+
+2006-06-27  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (handle_composition_prop): Set stop_charpos before push_it.
+
+2006-06-25  Kim F. Storm  <storm@cua.dk>
+
+        * s/gnu-linux.h (SIGNALS_VIA_CHARACTERS): Define for Linux kernel
+        version 2.4 and later.
+
+2006-06-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfns.c (Fx_create_frame): Set font parameter directly instead of
+        using x_default_parameter, since x_get_args clears the parm alist.
+
+2006-06-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * dired.c (directory_files_internal) [WINDOWSNT]: Find files
+        case-insensitively.
+
+2006-06-24  Aidan Kehoe  <kehoea@parhasard.net>
+
+        * lread.c (read_escape): When an unknown Unicode code point is
+        encountered as a string or character escape, signal an error.
+
+2006-06-23  Kim F. Storm  <storm@cua.dk>
+
+        * .gdbinit (pitx): Dump iterator stack.
+
+        * xdisp.c (handle_composition_prop): Push iterator on stack.
+        (set_iterator_to_next): Pop iterator at end of composition.
+
+2006-06-23  Martin Rudalics  <rudalics@gmx.at>
+
+        * fileio.c (Frename_file) [DOS_NT]: Don't try to move directory to
+        itself on DOS_NT platforms, if the old and new names are identical
+        but for the letter-case.
+
+2006-06-21  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (struct it): Add `position' member to iterator stack.
+        Rename `pos' member to `current'.  Rearrange and add comments.
+
+        * xdisp.c (handle_stop): Set it->ignore_overlay_strings_at_pos_p
+        if  we get any overlays.
+        (set_cursor_from_row): Don't clobber `end' if we rescan from
+        start_string.
+        (push_it, pop_it): Save it->position.
+
 2006-06-19  Richard Stallman  <rms@gnu.org>
 
         * window.c (size_window): New arg FIRST_ONLY.  All callers changed.
@@ -5,7 +146,7 @@
         for the case of a top-level window and the following minibuffer.
         Don't exit because of no `next' when there is a parent.
         Use the FIRST_ONLY feature when resizing following windows.
-        
+
         * syntax.c (init_syntax_once): Give most control chars' syntax Spunct.
 
 2006-06-17  Kim F. Storm  <storm@cua.dk>
diff --git a/src/dired.c b/src/dired.c
index 4075f9b7b79..fe3382fd7a7 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -176,9 +176,15 @@ directory_files_internal (directory, full, match, nosort, attrs, id_format)
 #ifdef VMS
       bufp = compile_pattern (match, 0,
                               buffer_defaults.downcase_table, 0, 1);
-#else
+#else  /* !VMS */
+# ifdef WINDOWSNT
+      /* Windows users want case-insensitive wildcards.  */
+      bufp = compile_pattern (match, 0,
+                              buffer_defaults.case_canon_table, 0, 1);
+# else  /* !WINDOWSNT */
       bufp = compile_pattern (match, 0, Qnil, 0, 1);
-#endif
+# endif  /* !WINDOWSNT */
+#endif   /* !VMS */
     }
 
   /* Note: ENCODE_FILE and DECODE_FILE can GC because they can run
diff --git a/src/dispextern.h b/src/dispextern.h
index 8c9c427f68d..0acaf6b38ec 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1937,35 +1937,45 @@ struct it
      from what we previously had.  */
   struct iterator_stack_entry
   {
+    Lisp_Object string;
+    int string_nchars;
+    int end_charpos;
     int stop_charpos;
     int face_id;
-    Lisp_Object string;
+
+    /* Save values specific to a given method.  */
     union {
+      /* method == GET_FROM_IMAGE */
       struct {
         Lisp_Object object;
         struct it_slice slice;
         int image_id;
       } image;
+      /* method == GET_FROM_COMPOSITION */
       struct {
         Lisp_Object object;
         int c, len;
         int cmp_id, cmp_len;
       } comp;
+      /* method == GET_FROM_STRETCH */
       struct {
         Lisp_Object object;
       } stretch;
     } u;
-    struct display_pos pos;
-    int end_charpos;
-    int string_nchars;
+
+    /* current text and display positions.  */
+    struct text_pos position;
+    struct display_pos current;
     enum glyph_row_area area;
     enum it_method method;
     unsigned multibyte_p : 1;
     unsigned string_from_display_prop_p : 1;
     unsigned display_ellipsis_p : 1;
+
+    /* properties from display property that are reset by another display property. */
     Lisp_Object space_width;
-    short voffset;
     Lisp_Object font_height;
+    short voffset;
   }
   stack[IT_STACK_SIZE];
 
diff --git a/src/dispnew.c b/src/dispnew.c
index b899cd2bd93..bf0d0044491 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6490,7 +6490,7 @@ Lisp_Object
 sit_for (sec, usec, reading, display, initial_display)
      int sec, usec, reading, display, initial_display;
 {
-  int preempt = (sec >= 0) || (sec == 0 && usec >= 0);
+  int preempt = (sec > 0) || (sec == 0 && usec >= 0);
 
   swallow_events (display);
 
diff --git a/src/editfns.c b/src/editfns.c
index 4578af6973c..d758e82bbb0 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -626,7 +626,10 @@ find_field (pos, merge_at_boundary, beg_limit, beg, end_limit, end)
 DEFUN ("delete-field", Fdelete_field, Sdelete_field, 0, 1, 0,
        doc: /* Delete the field surrounding POS.
 A field is a region of text with the same `field' property.
-If POS is nil, the value of point is used for POS.  */)
+If POS is nil, the value of point is used for POS.
+
+An `args-out-of-range' error is signaled if POS is outside the
+buffer's accessible portion.  */)
      (pos)
      Lisp_Object pos;
 {
@@ -640,7 +643,10 @@ If POS is nil, the value of point is used for POS.  */)
 DEFUN ("field-string", Ffield_string, Sfield_string, 0, 1, 0,
        doc: /* Return the contents of the field surrounding POS as a string.
 A field is a region of text with the same `field' property.
-If POS is nil, the value of point is used for POS.  */)
+If POS is nil, the value of point is used for POS.
+
+An `args-out-of-range' error is signaled if POS is outside the
+buffer's accessible portion.  */)
      (pos)
      Lisp_Object pos;
 {
@@ -652,7 +658,10 @@ If POS is nil, the value of point is used for POS.  */)
 DEFUN ("field-string-no-properties", Ffield_string_no_properties, Sfield_string_no_properties, 0, 1, 0,
        doc: /* Return the contents of the field around POS, without text-properties.
 A field is a region of text with the same `field' property.
-If POS is nil, the value of point is used for POS.  */)
+If POS is nil, the value of point is used for POS.
+
+An `args-out-of-range' error is signaled if POS is outside the
+buffer's accessible portion.  */)
      (pos)
      Lisp_Object pos;
 {
@@ -668,7 +677,10 @@ If POS is nil, the value of point is used for POS.
 If ESCAPE-FROM-EDGE is non-nil and POS is at the beginning of its
 field, then the beginning of the *previous* field is returned.
 If LIMIT is non-nil, it is a buffer position; if the beginning of the field
-is before LIMIT, then LIMIT will be returned instead.  */)
+is before LIMIT, then LIMIT will be returned instead.
+
+An `args-out-of-range' error is signaled if POS is outside the
+buffer's accessible portion.  */)
      (pos, escape_from_edge, limit)
      Lisp_Object pos, escape_from_edge, limit;
 {
@@ -684,7 +696,10 @@ If POS is nil, the value of point is used for POS.
 If ESCAPE-FROM-EDGE is non-nil and POS is at the end of its field,
 then the end of the *following* field is returned.
 If LIMIT is non-nil, it is a buffer position; if the end of the field
-is after LIMIT, then LIMIT will be returned instead.  */)
+is after LIMIT, then LIMIT will be returned instead.
+
+An `args-out-of-range' error is signaled if POS is outside the
+buffer's accessible portion.  */)
      (pos, escape_from_edge, limit)
      Lisp_Object pos, escape_from_edge, limit;
 {
diff --git a/src/eval.c b/src/eval.c
index 5f8d266ec7b..30df5f8ea36 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -749,8 +749,7 @@ usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...)  */)
 
 DEFUN ("defvaralias", Fdefvaralias, Sdefvaralias, 2, 3, 0,
        doc: /* Make NEW-ALIAS a variable alias for symbol BASE-VARIABLE.
-Setting the value of NEW-ALIAS will subsequently set the value of BASE-VARIABLE,
- and getting the value of NEW-ALIAS will return the value BASE-VARIABLE has.
+Aliased variables always have the same value; setting one sets the other.
 Third arg DOCSTRING, if non-nil, is documentation for NEW-ALIAS.  If it is
  omitted or nil, NEW-ALIAS gets the documentation string of BASE-VARIABLE,
  or of the variable at the end of the chain of aliases, if BASE-VARIABLE is
diff --git a/src/fileio.c b/src/fileio.c
index 8ce89ba23f3..82af5cf6cf9 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2755,7 +2755,13 @@ This is what happens in interactive use with M-x.  */)
   CHECK_STRING (newname);
   file = Fexpand_file_name (file, Qnil);
 
-  if (!NILP (Ffile_directory_p (newname)))
+  if ((!NILP (Ffile_directory_p (newname)))
+#ifdef DOS_NT
+      /* If the file names are identical but for the case,
+         don't attempt to move directory to itself. */
+      && (NILP (Fstring_equal (Fdowncase (file), Fdowncase (newname))))
+#endif
+      )
     newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname);
   else
     newname = Fexpand_file_name (newname, Qnil);
diff --git a/src/insdel.c b/src/insdel.c
index 6decf7b3f27..df0831c9652 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -2064,6 +2064,8 @@ prepare_to_modify_buffer (start, end, preserve_ptr)
      int start, end;
      int *preserve_ptr;
 {
+  struct buffer *base_buffer;
+
   if (!NILP (current_buffer->read_only))
     Fbarf_if_buffer_read_only ();
 
@@ -2089,20 +2091,26 @@ prepare_to_modify_buffer (start, end, preserve_ptr)
         verify_interval_modification (current_buffer, start, end);
     }
 
+  /* For indirect buffers, use the base buffer to check clashes.  */
+  if (current_buffer->base_buffer != 0)
+    base_buffer = current_buffer->base_buffer;
+  else
+    base_buffer = current_buffer;
+
 #ifdef CLASH_DETECTION
-  if (!NILP (current_buffer->file_truename)
+  if (!NILP (base_buffer->file_truename)
       /* Make binding buffer-file-name to nil effective.  */
-      && !NILP (current_buffer->filename)
+      && !NILP (base_buffer->filename)
       && SAVE_MODIFF >= MODIFF)
-    lock_file (current_buffer->file_truename);
+    lock_file (base_buffer->file_truename);
 #else
   /* At least warn if this file has changed on disk since it was visited.  */
-  if (!NILP (current_buffer->filename)
+  if (!NILP (base_buffer->filename)
       && SAVE_MODIFF >= MODIFF
       && NILP (Fverify_visited_file_modtime (Fcurrent_buffer ()))
-      && !NILP (Ffile_exists_p (current_buffer->filename)))
+      && !NILP (Ffile_exists_p (base_buffer->filename)))
     call1 (intern ("ask-user-about-supersession-threat"),
-           current_buffer->filename);
+           base_buffer->filename);
 #endif /* not CLASH_DETECTION */
 
   signal_before_change (start, end, preserve_ptr);
diff --git a/src/lread.c b/src/lread.c
index 824bc5f7502..5d8e39d7fb1 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -659,7 +659,7 @@ read_filtered_event (no_switch_frame, ascii_required, error_nonascii,
      switch-frame events will read it and process it.  */
   if (no_switch_frame
       && EVENT_HAS_PARAMETERS (val)
-      && EQ (EVENT_HEAD (val), Qswitch_frame))
+      && EQ (EVENT_HEAD_KIND (EVENT_HEAD (val)), Qswitch_frame))
     {
       delayed_switch_frame = val;
       goto retry;
@@ -2107,7 +2107,7 @@ read_escape (readcharfun, stringp)
         while (++count <= unicode_hex_count)
           {
             c = READCHAR;
-            /* isdigit(), isalpha() may be locale-specific, which we don't
+            /* isdigit and isalpha may be locale-specific, which we don't
                want. */
             if      (c >= '0' && c <= '9')  i = (i << 4) + (c - '0');
             else if (c >= 'a' && c <= 'f')  i = (i << 4) + (c - 'a') + 10;
diff --git a/src/mac.c b/src/mac.c
index 5fc9ea4ee28..e25ed435342 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -46,11 +46,9 @@ Boston, MA 02110-1301, USA.  */
 #include <Folders.h>
 #include <Resources.h>
 #include <Aliases.h>
-#include <FixMath.h>
 #include <Timer.h>
 #include <OSA.h>
 #include <AppleScript.h>
-#include <Scrap.h>
 #include <Events.h>
 #include <Processes.h>
 #include <EPPC.h>
diff --git a/src/macfns.c b/src/macfns.c
index 6d77aea0409..10e7dd97fa1 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -2646,8 +2646,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
       error ("Cannot find any usable font");
     UNBLOCK_INPUT;
 
-    x_default_parameter (f, parms, Qfont, font,
-                         "font", "Font", RES_TYPE_STRING);
+    x_set_frame_parameters (f, Fcons (Fcons (Qfont, font), Qnil));
   }
 
   x_default_parameter (f, parms, Qborder_width, make_number (0),
diff --git a/src/macgui.h b/src/macgui.h
index 90688e5703e..01f5317aad6 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -114,7 +114,7 @@ typedef unsigned long Time;
 
 /* Whether to use Text Services Manager.  */
 #ifndef USE_MAC_TSM
-#ifdef MAC_OSX
+#if TARGET_API_MAC_CARBON
 #define USE_MAC_TSM 1
 #endif
 #endif
diff --git a/src/macterm.c b/src/macterm.c
index 7e354642759..a6fc6b1a497 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -198,6 +198,8 @@ static int input_signal_count;
 
 extern Lisp_Object Vsystem_name;
 
+extern Lisp_Object Qeql;
+
 /* A mask of extra modifier bits to put into every keyboard char.  */
 
 extern EMACS_INT extra_keyboard_modifiers;
@@ -6050,13 +6052,28 @@ x_set_mouse_pixel_position (f, pix_x, pix_y)
      struct frame *f;
      int pix_x, pix_y;
 {
-#if 0 /* MAC_TODO: CursorDeviceMoveTo is non-Carbon */
+#ifdef MAC_OSX
+  Point p;
+  CGPoint point;
+
+  BLOCK_INPUT;
+  SetPortWindowPort (FRAME_MAC_WINDOW (f));
+  p.h = pix_x;
+  p.v = pix_y;
+  LocalToGlobal (&p);
+  point.x = p.h;
+  point.y = p.v;
+  CGWarpMouseCursorPosition (point);
+  UNBLOCK_INPUT;
+#else
+#if 0 /* MAC_TODO: LMSetMouseLocation and CursorDeviceMoveTo are non-Carbon */
   BLOCK_INPUT;
 
   XWarpPointer (FRAME_X_DISPLAY (f), None, FRAME_X_WINDOW (f),
                 0, 0, 0, 0, pix_x, pix_y);
   UNBLOCK_INPUT;
 #endif
+#endif
 }
 
 /* focus shifting, raising and lowering.  */
@@ -6916,6 +6933,8 @@ static Lisp_Object fm_font_family_alist;
 #if USE_ATSUI
 /* Hash table linking font family names to ATSU font IDs.  */
 static Lisp_Object atsu_font_id_hash;
+/* Alist linking Font Manager style to face attributes.  */
+static Lisp_Object fm_style_face_attributes_alist;
 static Lisp_Object Vmac_atsu_font_table;
 extern Lisp_Object QCfamily, QCweight, QCslant, Qnormal, Qbold, Qitalic;
 #endif
@@ -7151,6 +7170,29 @@ add_mac_font_name (name, size, style, charset)
     }
 }
 
+#if USE_ATSUI
+static Lisp_Object
+fm_style_to_face_attributes (fm_style)
+     FMFontStyle fm_style;
+{
+  Lisp_Object tem;
+
+  fm_style &= (bold | italic);
+  tem = assq_no_quit (make_number (fm_style),
+                      fm_style_face_attributes_alist);
+  if (!NILP (tem))
+    return XCDR (tem);
+
+  tem = list4 (QCweight, fm_style & bold ? Qbold : Qnormal,
+               QCslant, fm_style & italic ? Qitalic : Qnormal);
+  fm_style_face_attributes_alist =
+    Fcons (Fcons (make_number (fm_style), tem),
+           fm_style_face_attributes_alist);
+
+  return tem;
+}
+#endif
+
 /* Sets up the table font_name_table to contain the list of all fonts
    in the system the first time the table is used so that the Resource
    Manager need not be accessed every time this information is
@@ -7219,14 +7261,12 @@ init_font_name_table ()
                 decode_mac_font_name (name, name_len + 1, Qnil);
                 family = make_unibyte_string (name, name_len);
                 FMGetFontFamilyInstanceFromFont (font_ids[i], &ff, &style);
-                Fputhash (make_unibyte_string ((char *)(font_ids + i),
-                                               sizeof (ATSUFontID)),
+                Fputhash ((font_ids[i] > MOST_POSITIVE_FIXNUM
+                           ? make_float (font_ids[i])
+                           : make_number (font_ids[i])),
                           Fcons (QCfamily,
-                                 list5 (family,
-                                        QCweight,
-                                        style & bold ? Qbold : Qnormal,
-                                        QCslant,
-                                        style & italic ? Qitalic : Qnormal)),
+                                 Fcons (family,
+                                        fm_style_to_face_attributes (style))),
                           Vmac_atsu_font_table);
                 if (*name != '.'
                     && hash_lookup (h, family, &hash_code) < 0)
@@ -8534,6 +8574,7 @@ static Lisp_Object Qupdate_active_input_area, Qunicode_for_key_event;
 static Lisp_Object Vmac_ts_active_input_overlay;
 extern Lisp_Object Qbefore_string;
 static Lisp_Object Vmac_ts_script_language_on_focus;
+static Lisp_Object saved_ts_script_language_on_focus;
 static ScriptLanguageRecord saved_ts_language;
 static Component saved_ts_component;
 #endif
@@ -8896,11 +8937,17 @@ mac_tsm_resume ()
 
   if (err == noErr)
     {
-      if (EQ (Vmac_ts_script_language_on_focus, Qt))
+      if (EQ (Vmac_ts_script_language_on_focus, Qt)
+          && EQ (saved_ts_script_language_on_focus, Qt))
         slptr = &saved_ts_language;
       else if (CONSP (Vmac_ts_script_language_on_focus)
                && INTEGERP (XCAR (Vmac_ts_script_language_on_focus))
-               && INTEGERP (XCDR (Vmac_ts_script_language_on_focus)))
+               && INTEGERP (XCDR (Vmac_ts_script_language_on_focus))
+               && CONSP (saved_ts_script_language_on_focus)
+               && EQ (XCAR (saved_ts_script_language_on_focus),
+                      XCAR (Vmac_ts_script_language_on_focus))
+               && EQ (XCDR (saved_ts_script_language_on_focus),
+                      XCDR (Vmac_ts_script_language_on_focus)))
         {
           slrec.fScript = XINT (XCAR (Vmac_ts_script_language_on_focus));
           slrec.fLanguage = XINT (XCDR (Vmac_ts_script_language_on_focus));
@@ -8933,6 +8980,8 @@ mac_tsm_suspend ()
   OSStatus err;
   ScriptLanguageRecord slrec, *slptr = NULL;
 
+  saved_ts_script_language_on_focus = Vmac_ts_script_language_on_focus;
+
   if (EQ (Vmac_ts_script_language_on_focus, Qt))
     {
       err = GetTextServiceLanguage (&saved_ts_language);
@@ -9581,7 +9630,11 @@ mac_handle_text_input_event (next_handler, event, data)
      typeLongInteger,
      typeIntlWritingCode,
      typeLongInteger,
+#ifdef MAC_OSX
      typeUnicodeText,
+#else
+     typeChar,
+#endif
      typeTextRangeArray,
      typeTextRangeArray,
      typeOffsetArray,
@@ -10643,7 +10696,7 @@ XTread_socket (sd, expected, hold_quit)
 #endif
             mapped_modifiers &= modifiers;
 
-#if USE_CARBON_EVENTS && defined (MAC_OSX)
+#if USE_CARBON_EVENTS && (defined (MAC_OSX) || USE_MAC_TSM)
             /* When using Carbon Events, we need to pass raw keyboard
                events to the TSM ourselves.  If TSM handles it, it
                will pass back noErr, otherwise it will pass back
@@ -11299,7 +11352,11 @@ init_menu_bar ()
 static void
 init_tsm ()
 {
+#ifdef MAC_OSX
   static InterfaceTypeList types = {kUnicodeDocument};
+#else
+  static InterfaceTypeList types = {kTextService};
+#endif
 
   NewTSMDocument (sizeof (types) / sizeof (types[0]), types,
                   &tsm_document_id, 0);
@@ -11487,6 +11544,14 @@ syms_of_macterm ()
 #if USE_ATSUI
   staticpro (&atsu_font_id_hash);
   atsu_font_id_hash = Qnil;
+
+  staticpro (&fm_style_face_attributes_alist);
+  fm_style_face_attributes_alist = Qnil;
+#endif
+
+#if USE_MAC_TSM
+  staticpro (&saved_ts_script_language_on_focus);
+  saved_ts_script_language_on_focus = Qnil;
 #endif
 
   /* We don't yet support this, but defining this here avoids whining
@@ -11599,11 +11664,9 @@ CODING_SYSTEM is a coding system corresponding to TEXT-ENCODING.  */);
 
 #if USE_ATSUI
   DEFVAR_LISP ("mac-atsu-font-table", &Vmac_atsu_font_table,
-    doc: /* Hash table of ATSU font IDs vs plist of attributes and values.
-Each font ID is represented as a four-byte string in native byte
-order.  */);
+    doc: /* Hash table of ATSU font IDs vs plist of attributes and values.  */);
   Vmac_atsu_font_table =
-    make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE),
+    make_hash_table (Qeql, make_number (DEFAULT_HASH_SIZE),
                      make_float (DEFAULT_REHASH_SIZE),
                      make_float (DEFAULT_REHASH_THRESHOLD),
                      Qnil, Qnil, Qnil);
diff --git a/src/puresize.h b/src/puresize.h
index 67e758ae799..fa01ad610a1 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -43,7 +43,7 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (1210000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1210500 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 4ef3db9f2ea..817f1facdee 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -52,6 +52,9 @@ Boston, MA 02110-1301, USA.  */
 #if LINUX_VERSION_CODE >= 0x20000
 #define LINUX_MAP_SHARED_DOES_WORK
 #endif /* LINUX_VERSION_CODE >= 0x20000 */
+#if LINUX_VERSION_CODE >= 0x20400
+#define LINUX_SIGNALS_VIA_CHARACTERS_DOES_WORK
+#endif /* LINUX_VERSION_CODE >= 0x20400 */
 #endif /* HAVE_LINUX_VERSION_H */
 #endif /* emacs */
 #endif /* NOT_C_CODE */
@@ -247,9 +250,10 @@ Boston, MA 02110-1301, USA.  */
 #define C_DEBUG_SWITCH
 #endif
 
-/* Let's try this out, just in case.
-   Nah.  Rik Faith <faith@cs.unc.edu> says it doesn't work well.  */
-/* #define SIGNALS_VIA_CHARACTERS */
+/* 21 Jun 06: Eric Hanchrow <offby1@blarg.net> says this works.  */
+#ifdef LINUX_SIGNALS_VIA_CHARACTERS_DOES_WORK
+#define SIGNALS_VIA_CHARACTERS
+#endif
 
 /* Rob Malouf <malouf@csli.stanford.edu> says:
    SYSV IPC is standard a standard part of Linux since version 0.99pl10,
diff --git a/src/textprop.c b/src/textprop.c
index 87fa6742919..0318d12913f 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -690,10 +690,11 @@ overlays are considered only if they are associated with OBJECT.  */)
 DEFUN ("get-char-property-and-overlay", Fget_char_property_and_overlay,
        Sget_char_property_and_overlay, 2, 3, 0,
        doc: /* Like `get-char-property', but with extra overlay information.
-Return a cons whose car is the return value of `get-char-property'
-with the same arguments, that is, the value of POSITION's property
-PROP in OBJECT, and whose cdr is the overlay in which the property was
+The value is a cons cell.  Its car is the return value of `get-char-property'
+with the same arguments--that is, the value of POSITION's property
+PROP in OBJECT.  Its cdr is the overlay in which the property was
 found, or nil, if it was found as a text property or not found at all.
+
 OBJECT is optional and defaults to the current buffer.  OBJECT may be
 a string, a buffer or a window.  For strings, the cdr of the return
 value is always nil, since strings do not have overlays.  If OBJECT is
@@ -1787,8 +1788,12 @@ text_property_stickiness (prop, pos, buffer)
         /* PROP is rear-non-sticky.  */
         is_rear_sticky = 0;
     }
+  else
+    return 0;
 
   /* Consider following character.  */
+  /* This signals an arg-out-of-range error if pos is outside the
+     buffer's accessible range.  */
   front_sticky = Fget_text_property (pos, Qfront_sticky, buffer);
 
   if (EQ (front_sticky, Qt)
diff --git a/src/w32console.c b/src/w32console.c
index a696534a4b6..b660d74f852 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -705,7 +705,7 @@ syms_of_ntterm ()
   DEFVAR_BOOL ("w32-use-full-screen-buffer",
                &w32_use_full_screen_buffer,
                doc: /* Non-nil means make terminal frames use the full screen buffer dimensions.
-This is desirable when running Emacs over telnet, and is the default.
+This is desirable when running Emacs over telnet.
 A value of nil means use the current console window dimensions; this
 may be preferrable when working directly at the console with a large
 scroll-back buffer.  */);
diff --git a/src/w32fns.c b/src/w32fns.c
index aa83e006194..b548c2c1efe 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2086,8 +2086,8 @@ w32_createwindow (f)
     = CreateWindow (EMACS_CLASS,
                     f->namebuf,
                     f->output_data.w32->dwStyle | WS_CLIPCHILDREN,
-                    f->left_pos,
-                    f->top_pos,
+                    CW_USEDEFAULT,
+                    SW_SHOW,
                     rect.right - rect.left,
                     rect.bottom - rect.top,
                     NULL,
@@ -2108,6 +2108,11 @@ w32_createwindow (f)
 
       /* Do this to discard the default setting specified by our parent. */
       ShowWindow (hwnd, SW_HIDE);
+
+      /* Update frame positions. */
+      GetWindowRect (hwnd, &rect);
+      f->left_pos = rect.left;
+      f->top_pos = rect.top;
     }
 }
 
diff --git a/src/w32term.c b/src/w32term.c
index 8e3d14b600c..3683089cb3e 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5833,7 +5833,22 @@ x_make_frame_visible (f)
          before the window gets really visible.  */
       if (! FRAME_ICONIFIED_P (f)
           && ! f->output_data.w32->asked_for_visible)
-        x_set_offset (f, f->left_pos, f->top_pos, 0);
+        {
+          RECT workarea_rect;
+          RECT window_rect;
+
+          /* Adjust vertical window position in order to avoid being
+             covered by a task bar placed at the bottom of the desktop. */
+          SystemParametersInfo(SPI_GETWORKAREA, 0, &workarea_rect, 0);
+          GetWindowRect(FRAME_W32_WINDOW(f), &window_rect);
+          if (window_rect.bottom > workarea_rect.bottom
+              && window_rect.top > workarea_rect.top)
+            f->top_pos = max (window_rect.top
+                              - window_rect.bottom + workarea_rect.bottom,
+                              workarea_rect.top);
+
+          x_set_offset (f, f->left_pos, f->top_pos, 0);
+        }
 
       f->output_data.w32->asked_for_visible = 1;
 
diff --git a/src/xdisp.c b/src/xdisp.c
index bf51137c716..8a745ac778e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3038,6 +3038,7 @@ handle_stop (it)
                 return;
               if (!get_overlay_strings_1 (it, 0, 0))
                 return;
+              it->ignore_overlay_strings_at_pos_p = 1;
               it->string_from_display_prop_p = 0;
               handle_overlay_change_p = 0;
               handled = HANDLED_RECOMPUTE_PROPS;
@@ -4588,6 +4589,10 @@ handle_composition_prop (it)
                 }
               return HANDLED_RECOMPUTE_PROPS;
             }
+
+          it->stop_charpos = end;
+          push_it (it);
+
           it->method = GET_FROM_COMPOSITION;
           it->cmp_id = id;
           it->cmp_len = COMPOSITION_LENGTH (prop);
@@ -4602,7 +4607,6 @@ handle_composition_prop (it)
           it->len = (STRINGP (it->string)
                      ? string_char_to_byte (it->string, end)
                      : CHAR_TO_BYTE (end)) - pos_byte;
-          it->stop_charpos = end;
           handled = HANDLED_RETURN;
         }
     }
@@ -5031,7 +5035,8 @@ push_it (it)
       p->u.stretch.object = it->object;
       break;
     }
-  p->pos = it->current;
+  p->position = it->position;
+  p->current = it->current;
   p->end_charpos = it->end_charpos;
   p->string_nchars = it->string_nchars;
   p->area = it->area;
@@ -5062,7 +5067,8 @@ pop_it (it)
   p = it->stack + it->sp;
   it->stop_charpos = p->stop_charpos;
   it->face_id = p->face_id;
-  it->current = p->pos;
+  it->current = p->current;
+  it->position = p->position;
   it->string = p->string;
   if (NILP (it->string))
     SET_TEXT_POS (it->current.string_pos, -1, -1);
@@ -5220,6 +5226,7 @@ back_to_previous_visible_line_start (it)
   while (IT_CHARPOS (*it) > BEGV)
     {
       back_to_previous_line_start (it);
+
       if (IT_CHARPOS (*it) <= BEGV)
         break;
 
@@ -5892,19 +5899,19 @@ set_iterator_to_next (it, reseat_p)
 
     case GET_FROM_COMPOSITION:
       xassert (it->cmp_id >= 0 && it->cmp_id < n_compositions);
-      if (STRINGP (it->string))
+      xassert (it->sp > 0);
+      pop_it (it);
+      if (it->method == GET_FROM_STRING)
         {
           IT_STRING_BYTEPOS (*it) += it->len;
           IT_STRING_CHARPOS (*it) += it->cmp_len;
-          it->method = GET_FROM_STRING;
           it->object = it->string;
           goto consider_string_end;
         }
-      else
+      else if (it->method == GET_FROM_BUFFER)
         {
           IT_BYTEPOS (*it) += it->len;
           IT_CHARPOS (*it) += it->cmp_len;
-          it->method = GET_FROM_BUFFER;
           it->object = it->w->buffer;
         }
       break;
@@ -9718,6 +9725,12 @@ display_tool_bar_line (it, height)
               /* Glyph doesn't fit on line.  Backtrack.  */
               row->used[TEXT_AREA] = n_glyphs_before;
               *it = it_before;
+              /* If this is the only glyph on this line, it will never fit on the
+                 toolbar, so skip it.   But ensure there is at least one glyph,
+                 so we don't accidentally disable the tool-bar.  */
+              if (n_glyphs_before == 0
+                  && (it->vpos > 0 || IT_STRING_CHARPOS (*it) < it->end_charpos-1))
+                break;
               goto out;
             }
 
@@ -9776,6 +9789,11 @@ display_tool_bar_line (it, height)
 }
 
 
+/* Max tool-bar height.  */
+
+#define MAX_FRAME_TOOL_BAR_HEIGHT(f) \
+  ((FRAME_LINE_HEIGHT (f) * FRAME_LINES (f)))
+
 /* Value is the number of screen lines needed to make all tool-bar
    items of frame F visible.  The number of actual rows needed is
    returned in *N_ROWS if non-NULL.  */
@@ -9787,7 +9805,10 @@ tool_bar_lines_needed (f, n_rows)
 {
   struct window *w = XWINDOW (f->tool_bar_window);
   struct it it;
-  struct glyph_row *temp_row = w->desired_matrix->rows;
+  /* tool_bar_lines_needed is called from redisplay_tool_bar after building
+     the desired matrix, so use (unused) mode-line row as temporary row to
+     avoid destroying the first tool-bar row.  */
+  struct glyph_row *temp_row = MATRIX_MODE_LINE_ROW (w->desired_matrix);
 
   /* Initialize an iterator for iteration over
      F->desired_tool_bar_string in the tool-bar window of frame F.  */
@@ -9893,13 +9914,13 @@ redisplay_tool_bar (f)
           int old_height = WINDOW_TOTAL_LINES (w);
 
           XSETFRAME (frame, f);
-          clear_glyph_matrix (w->desired_matrix);
           Fmodify_frame_parameters (frame,
                                     Fcons (Fcons (Qtool_bar_lines,
                                                   make_number (nlines)),
                                            Qnil));
           if (WINDOW_TOTAL_LINES (w) != old_height)
             {
+              clear_glyph_matrix (w->desired_matrix);
               fonts_changed_p = 1;
               return 1;
             }
@@ -9951,17 +9972,20 @@ redisplay_tool_bar (f)
 
   if (auto_resize_tool_bars_p)
     {
-      int nlines;
+      int nlines, nrows;
+      int max_tool_bar_height = MAX_FRAME_TOOL_BAR_HEIGHT (f);
 
       /* If we couldn't display everything, change the tool-bar's
-         height.  */
-      if (IT_STRING_CHARPOS (it) < it.end_charpos)
+         height if there is room for more.  */
+      if (IT_STRING_CHARPOS (it) < it.end_charpos
+          && it.current_y < max_tool_bar_height)
         change_height_p = 1;
 
+      row = it.glyph_row - 1;
+
       /* If there are blank lines at the end, except for a partially
          visible blank line at the end that is smaller than
          FRAME_LINE_HEIGHT, change the tool-bar's height.  */
-      row = it.glyph_row - 1;
       if (!row->displays_text_p
           && row->height >= FRAME_LINE_HEIGHT (f))
         change_height_p = 1;
@@ -9969,13 +9993,14 @@ redisplay_tool_bar (f)
       /* If row displays tool-bar items, but is partially visible,
          change the tool-bar's height.  */
       if (row->displays_text_p
-          && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y)
+          && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y
+          && MATRIX_ROW_BOTTOM_Y (row) < max_tool_bar_height)
         change_height_p = 1;
 
       /* Resize windows as needed by changing the `tool-bar-lines'
          frame parameter.  */
       if (change_height_p
-          && (nlines = tool_bar_lines_needed (f, &f->n_tool_bar_rows),
+          && (nlines = tool_bar_lines_needed (f, &nrows),
               nlines != WINDOW_TOTAL_LINES (w)))
         {
           extern Lisp_Object Qtool_bar_lines;
@@ -9983,13 +10008,16 @@ redisplay_tool_bar (f)
           int old_height = WINDOW_TOTAL_LINES (w);
 
           XSETFRAME (frame, f);
-          clear_glyph_matrix (w->desired_matrix);
           Fmodify_frame_parameters (frame,
                                     Fcons (Fcons (Qtool_bar_lines,
                                                   make_number (nlines)),
                                            Qnil));
           if (WINDOW_TOTAL_LINES (w) != old_height)
-            fonts_changed_p = 1;
+            {
+              clear_glyph_matrix (w->desired_matrix);
+              f->n_tool_bar_rows = nrows;
+              fonts_changed_p = 1;
+            }
         }
     }
 
@@ -11919,25 +11947,25 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
          glyph on point by scanning from string_start again.  */
       Lisp_Object limit;
       Lisp_Object string;
+      struct glyph *stop = glyph;
       int pos;
 
       limit = make_number (pt_old + 1);
-      end = glyph;
       glyph = string_start;
       x = string_start_x;
       string = glyph->object;
       pos = string_buffer_position (w, string, string_before_pos);
       /* If STRING is from overlay, LAST_POS == 0.  We skip such glyphs
          because we always put cursor after overlay strings.  */
-      while (pos == 0 && glyph < end)
+      while (pos == 0 && glyph < stop)
         {
           string = glyph->object;
-          SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
-          if (glyph < end)
+          SKIP_GLYPHS (glyph, stop, x, EQ (glyph->object, string));
+          if (glyph < stop)
             pos = string_buffer_position (w, glyph->object, string_before_pos);
         }
 
-      while (glyph < end)
+      while (glyph < stop)
         {
           pos = XINT (Fnext_single_char_property_change
                       (make_number (pos), Qdisplay, Qnil, limit));
@@ -11945,13 +11973,13 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
             break;
           /* Skip glyphs from the same string.  */
           string = glyph->object;
-          SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
+          SKIP_GLYPHS (glyph, stop, x, EQ (glyph->object, string));
           /* Skip glyphs from an overlay.  */
-          while (glyph < end
+          while (glyph < stop
                  && ! string_buffer_position (w, glyph->object, pos))
             {
               string = glyph->object;
-              SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
+              SKIP_GLYPHS (glyph, stop, x, EQ (glyph->object, string));
             }
         }
 
diff --git a/src/xfaces.c b/src/xfaces.c
index efdb7b0a660..7a5f6edfc32 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5098,7 +5098,14 @@ x_update_menu_appearance (f)
 DEFUN ("face-attribute-relative-p", Fface_attribute_relative_p,
        Sface_attribute_relative_p,
        2, 2, 0,
-       doc: /* Return non-nil if face ATTRIBUTE VALUE is relative.  */)
+       doc: /* Check whether a face attribute value is relative.
+Specifically, this function returns t if the attribute ATTRIBUTE
+with the value VALUE is relative.
+
+A relative value is one that doesn't entirely override whatever is
+inherited from another face.  For most possible attributes,
+the only relative value that users see is `unspecified'.
+However, for :height, floating point values are also relative.  */)
      (attribute, value)
      Lisp_Object attribute, value;
 {
diff --git a/src/xfns.c b/src/xfns.c
index 5924ba21f88..253f2829f85 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3099,7 +3099,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
   f->output_data.x->scroll_bar_top_shadow_pixel = -1;
   f->output_data.x->scroll_bar_bottom_shadow_pixel = -1;
 #endif /* USE_TOOLKIT_SCROLL_BARS */
-  record_unwind_protect (unwind_create_frame, frame);
 
   f->icon_name
     = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title",
@@ -3108,6 +3107,9 @@ This function is an internal primitive--use `make-frame' instead.  */)
     f->icon_name = Qnil;
 
   FRAME_X_DISPLAY_INFO (f) = dpyinfo;
+
+  /* With FRAME_X_DISPLAY_INFO set up, this unwind-protect is safe.  */
+  record_unwind_protect (unwind_create_frame, frame);
 #if GLYPH_DEBUG
   image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
   dpyinfo_refcount = dpyinfo->reference_count;
@@ -4847,8 +4849,7 @@ else
     if (! STRINGP (font))
       font = build_string ("fixed");
 
-    x_default_parameter (f, parms, Qfont, font,
-                         "font", "Font", RES_TYPE_STRING);
+    x_set_frame_parameters (f, Fcons (Fcons (Qfont, font), Qnil));
   }
 
   x_default_parameter (f, parms, Qborder_width, make_number (2),
diff --git a/src/xterm.c b/src/xterm.c
index 0c2014b184f..19dc35ff85d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11230,12 +11230,16 @@ x_delete_display (dpyinfo)
         xfree (dpyinfo->font_table[i].name);
       }
 
-  if (dpyinfo->font_table->font_encoder)
-    xfree (dpyinfo->font_table->font_encoder);
-
-  xfree (dpyinfo->font_table);
-  xfree (dpyinfo->x_id_name);
-  xfree (dpyinfo->color_cells);
+  if (dpyinfo->font_table)
+    {
+      if (dpyinfo->font_table->font_encoder)
+        xfree (dpyinfo->font_table->font_encoder);
+      xfree (dpyinfo->font_table);
+    }
+  if (dpyinfo->x_id_name)
+    xfree (dpyinfo->x_id_name);
+  if (dpyinfo->color_cells)
+    xfree (dpyinfo->color_cells);
   xfree (dpyinfo);
 }