Merged from miles@gnu.org--gnu-2005 (patch 656-658)

Patches applied:

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

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

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

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

8 files changed, 89 insertions, 12 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 3f7755a3d8e..7af2f7d5721 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 2000, 01, 2004
+# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 2000, 01, 2004, 2005
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
@@ -628,7 +628,7 @@ Print the contents of $, assuming it is an Emacs Lisp cons.
 end
 
 define nextcons
-  p $.cdr
+  p $.u.cdr
   xcons
 end
 document nextcons
@@ -648,7 +648,7 @@ end
 define xcdr
   xgetptr $
   xgettype $
-  print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->cdr : 0)
+  print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->u.cdr : 0)
 end
 document xcdr
 Print the cdr of $, assuming it is an Emacs Lisp pair.
@@ -656,7 +656,7 @@ end
 
 define xfloat
   xgetptr $
-  print ((struct Lisp_Float *) $ptr)->data
+  print ((struct Lisp_Float *) $ptr)->u.data
 end
 document xfloat
 Print $ assuming it is a lisp floating-point number.
diff --git a/src/ChangeLog b/src/ChangeLog
index 1a9fd720167..105a03a2b8c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,46 @@
+2005-11-21  Ken Raeburn  <raeburn@mit.edu>
+
+        * keymap.c (shadow_lookup): Use make_number to pass a number to
+        Fsubstring.
+
+2005-11-21  Juri Linkov  <juri@jurta.org>
+
+        * puresize.h (BASE_PURESIZE): Increment to 1180000.
+
+2005-11-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfaces.c (Finternal_set_lisp_face_attribute): Use
+        :ignore-defface for new frame defaults when `unspecified' is
+        supplied.
+        (Finternal_get_lisp_face_attribute): Hide :ignore-defface.
+        (merge_face_vectors): Don't do :ignore-defface overwriting here.
+        (Finternal_merge_in_global_face): Do it here.
+
+2005-11-20  Juri Linkov  <juri@jurta.org>
+
+        * charset.c (invalid_character): Use Lisp-readable syntax
+        for octal and hex.  Reorder decimal, octal and hex values.
+
+2005-11-20  Nick Roberts  <nickrob@snap.net.nz>
+
+        * lisp.h: Use typedef when Lisp_Object is EMACS_INT so that
+        this type is recognised when debugging.
+
+2005-11-19  Andreas Schwab  <schwab@suse.de>
+
+        * .gdbinit (nextcons, xcdr, xfloat): Update for changes in
+        Lisp_Cons and Lisp_Float.
+
+2005-11-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c [USE_CG_TEXT_DRAWING] (cg_text_anti_aliasing_threshold):
+        New variable.
+        [USE_CG_TEXT_DRAWING] (init_cg_text_anti_aliasing_threshold): New
+        function.
+        (init_font_name_table) [USE_ATSUI && USE_CG_TEXT_DRAWING]: Use it.
+        [USE_CG_TEXT_DRAWING] (mac_draw_string_cg): Don't do antialiasing if
+        font size is smaller than or equal to cg_text_anti_aliasing_threshold.
+
 2005-11-17  Chong Yidong  <cyd@stupidchicken.com>
 
         * image.c (x_create_bitmap_from_xpm_data): Free attributes on
diff --git a/src/charset.c b/src/charset.c
index b4f84a9e785..23b2cc75c1f 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -115,7 +115,7 @@ void
 invalid_character (c)
      int c;
 {
-  error ("Invalid character: 0%o, %d, 0x%x", c, c, c);
+  error ("Invalid character: %d, #o%o, #x%x", c, c, c);
 }
 
 /* Parse string STR of length LENGTH and fetch information of a
diff --git a/src/image.c b/src/image.c
index c7bc71ee909..d020b2ac394 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3755,7 +3755,7 @@ x_create_bitmap_from_xpm_data (f, bits)
   XpmFreeAttributes (&attrs);
   return id;
 }
-#endif /* HAVE_X_WINDOWS */
+#endif /* defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) */
 
 /* Load image IMG which will be displayed on frame F.  Value is
    non-zero if successful.  */
diff --git a/src/keymap.c b/src/keymap.c
index a19b0102127..a6d5ccbbc2d 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2372,7 +2372,8 @@ shadow_lookup (shadow, key, flag)
       value = Flookup_key (XCAR (tail), key, flag);
       if (NATNUMP (value))
         {
-          value = Flookup_key (XCAR (tail), Fsubstring (key, 0, value), flag);
+          value = Flookup_key (XCAR (tail),
+                               Fsubstring (key, make_number (0), value), flag);
           if (!NILP (value))
             return Qnil;
         }
diff --git a/src/lisp.h b/src/lisp.h
index 767e97a94a6..f440f104cb9 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -253,7 +253,7 @@ LISP_MAKE_RVALUE (Lisp_Object o)
 /* If union type is not wanted, define Lisp_Object as just a number.  */
 
 #ifdef NO_UNION_TYPE
-#define Lisp_Object EMACS_INT
+typedef EMACS_INT Lisp_Object;
 #define LISP_MAKE_RVALUE(o) (0+(o))
 #endif /* NO_UNION_TYPE */
 
diff --git a/src/macterm.c b/src/macterm.c
index 169e3d60855..6c74e429726 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -867,6 +867,19 @@ mac_draw_image_string_16 (f, gc, x, y, buf, nchars)
 #if USE_CG_TEXT_DRAWING
 static XCharStruct *x_per_char_metric P_ ((XFontStruct *, XChar2b *));
 
+static int cg_text_anti_aliasing_threshold = 8;
+
+static void
+init_cg_text_anti_aliasing_threshold ()
+{
+  Lisp_Object val =
+    Fmac_get_preference (build_string ("AppleAntiAliasingThreshold"),
+                         Qnil, Qnil, Qnil);
+
+  if (INTEGERP (val))
+    cg_text_anti_aliasing_threshold = XINT (val);
+}
+
 static int
 mac_draw_string_cg (f, gc, x, y, buf, nchars)
      struct frame *f;
@@ -915,6 +928,8 @@ mac_draw_string_cg (f, gc, x, y, buf, nchars)
                             1.0);
   CGContextSetFont (context, GC_FONT (gc)->cg_font);
   CGContextSetFontSize (context, GC_FONT (gc)->mac_fontsize);
+  if (GC_FONT (gc)->mac_fontsize <= cg_text_anti_aliasing_threshold)
+    CGContextSetShouldAntialias (context, false);
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
   CGContextSetTextPosition (context, gx, gy);
   CGContextShowGlyphsWithAdvances (context, glyphs, advances, nchars);
@@ -6784,6 +6799,9 @@ init_font_name_table ()
   text_encoding_info_alist = create_text_encoding_info_alist ();
 
 #if USE_ATSUI
+#if USE_CG_TEXT_DRAWING
+  init_cg_text_anti_aliasing_threshold ();
+#endif
   if (!NILP (assq_no_quit (make_number (kTextEncodingMacUnicode),
                            text_encoding_info_alist)))
     {
diff --git a/src/xfaces.c b/src/xfaces.c
index 647cf7bb337..c096b15ba1f 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3593,8 +3593,6 @@ merge_face_vectors (f, from, to, named_merge_points)
       {
         if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
           to[i] = merge_face_heights (from[i], to[i], to[i]);
-        else if (IGNORE_DEFFACE_P (from[i]))
-          to[i] = Qunspecified;
         else
           to[i] = from[i];
       }
@@ -4071,7 +4069,18 @@ FRAME 0 means change the face on all frames, and change the default
 
   /* Set lface to the Lisp attribute vector of FACE.  */
   if (EQ (frame, Qt))
-    lface = lface_from_face_name (NULL, face, 1);
+    {
+      lface = lface_from_face_name (NULL, face, 1);
+
+      /* When updating face-new-frame-defaults, we put :ignore-defface
+         where the caller wants `unspecified'.  This forces the frame
+         defaults to ignore the defface value.  Otherwise, the defface
+         will take effect, which is generally not what is intended.
+         The value of that attribute will be inherited from some other
+         face during face merging.  See internal_merge_in_global_face. */
+      if (UNSPECIFIEDP (value))
+        value = Qignore_defface;
+    }
   else
     {
       if (NILP (frame))
@@ -4897,6 +4906,9 @@ frames).  If FRAME is omitted or nil, use the selected frame.  */)
   else
     signal_error ("Invalid face attribute name", keyword);
 
+  if (IGNORE_DEFFACE_P (value))
+    return Qunspecified;
+
   return value;
 }
 
@@ -4979,7 +4991,10 @@ Default face attributes override any local face attributes.  */)
   gvec = XVECTOR (global_lface)->contents;
   for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
     if (! UNSPECIFIEDP (gvec[i]))
-      lvec[i] = gvec[i];
+      if (IGNORE_DEFFACE_P (gvec[i]))
+        lvec[i] = Qunspecified;
+      else
+        lvec[i] = gvec[i];
 
   return Qnil;
 }