Merged from miles@gnu.org--gnu-2005 (patch 152-156, 642-654)

Patches applied:

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-647
   lisp/gnus/ChangeLog: Remove duplicate entry

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-152
   Update from CVS: lisp/mml.el (mml-preview): Doc fix.

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

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

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

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

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

23 files changed, 1236 insertions, 206 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 462b6a86c5f..3f7755a3d8e 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -31,6 +31,9 @@ dir ../lwlib
 # However, C-z works just as well in that case.
 handle 2 noprint pass
 
+# Make it work like SIGINT normally does.
+handle SIGTSTP nopass
+
 # Don't pass SIGALRM to Emacs.  This makes problems when
 # debugging.
 handle SIGALRM ignore
@@ -66,13 +69,53 @@ end
 # Print out s-expressions
 define pp
   set $tmp = $arg0
-  set debug_print ($tmp)
+  set safe_debug_print ($tmp)
 end
 document pp
 Print the argument as an emacs s-expression
 Works only when an inferior emacs is executing.
 end
 
+# Print out s-expressions from tool bar
+define pp1
+  set $tmp = $arg0
+  echo $arg0
+  printf " = "
+  set safe_debug_print ($tmp)
+end
+document pp1
+Print the argument as an emacs s-expression
+Works only when an inferior emacs is executing.
+For use on tool bar when debugging in Emacs
+where the variable name would not otherwise
+be recorded in the GUD buffer.
+end
+
+# Print value of lisp variable
+define pv
+  set $tmp = "$arg0"
+  set safe_debug_print ( find_symbol_value (intern ($tmp)))
+end
+document pv
+Print the value of the lisp variable given as argument.
+Works only when an inferior emacs is executing.
+end
+
+# Print value of lisp variable
+define pv1
+  set $tmp = "$arg0"
+  echo $arg0
+  printf " = "
+  set safe_debug_print (find_symbol_value (intern ($tmp)))
+end
+document pv1
+Print the value of the lisp variable given as argument.
+Works only when an inferior emacs is executing.
+For use on tool bar when debugging in Emacs
+where the variable name would not otherwise
+be recorded in the GUD buffer.
+end
+
 # Print out current buffer point and boundaries
 define ppt
   set $b = current_buffer
@@ -122,7 +165,7 @@ define pitx
     printf " HL"
   end
   if ($it->n_overlay_strings > 0)
-    printf " nov=%d"
+    printf " nov=%d", $it->n_overlay_strings
   end
   if ($it->sp != 0)
     printf " sp=%d", $it->sp
@@ -672,6 +715,16 @@ document xbacktrace
   an error was signaled.
 end
 
+# Show Lisp backtrace after normal backtrace.
+define hookpost-backtrace
+  set $bt = backtrace_list
+  if $bt
+    echo \n
+    echo Lisp Backtrace:\n
+    xbacktrace
+  end
+end
+
 define xreload
   set $tagmask = (((long)1 << gdb_gctypebits) - 1)
   set $valmask = gdb_use_lsb ? ~($tagmask) : ((long)1 << gdb_valbits) - 1
diff --git a/src/ChangeLog b/src/ChangeLog
index e2798ad1268..900db33db3d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,152 @@
+2005-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c (readevalloop): Add missing GCPROs.
+
+2005-11-16  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfns.c (xg_set_icon_from_xpm_data): New function.
+
+        * gnu.h (gnu_xpm_bits): Rename from gnu_bits.
+        (gnu_xbm_bits): Rename from gnu_bits (xbm version).
+
+        * xterm.c (x_bitmap_icon): Use the xpm if available.
+
+        * image.c (x_create_bitmap_from_xpm_data): New function.
+        (x_create_bitmap_from_xpm_data): Initialize XpmAttributes.
+
+2005-11-15  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * Makefile.in (lisp, shortlisp): Add rfn-eshadow.
+
+2005-11-16  Nick Roberts  <nickrob@snap.net.nz>
+
+        * .gdbinit: Make SIGTSTP work like SIGINT normally does.
+
+2005-11-15  Andreas Schwab  <schwab@suse.de>
+
+        * lisp.h (struct Lisp_Cons): Make cdr a union.
+        (XCDR_AS_LVALUE): Adjust.
+        (struct Lisp_Float): Make data a union.
+        (XFLOAT_DATA): Adjust.
+
+        * alloc.c (free_float): Make free list chaining aliasing-safe.
+        (make_float): Likewise.
+        (free_cons): Likewise.
+        (Fcons): Likewise.
+        (check_cons_list): Likewise.
+        (Fmake_symbol): Likewise.
+        (allocate_misc): Likewise.
+        (free_misc): Likewise.
+        (gc_sweep): Likewise.
+
+2005-11-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mac.c (HASHKEY_QUERY_CACHE): New define.
+        (xrm_create_database, xrm_q_put_resource): Empty query cache.
+        (xrm_get_resource): Use query cache.
+
+        * image.c (init_image) [MAC_OS]: Don't call EnterMovies if
+        inhibit_window_system is set.
+
+2005-11-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macgui.h (USE_CG_TEXT_DRAWING): New define.
+        (struct MacFontStruct) [USE_CG_TEXT_DRAWING]: New members cg_font
+        and cg_glyphs.
+
+        * macterm.c [USE_CG_TEXT_DRAWING] (mac_draw_string_cg): New function.
+        (x_draw_glyph_string_foreground) [USE_CG_TEXT_DRAWING]: Use it.
+        (XLoadQueryFont) [USE_CG_TEXT_DRAWING]: Set members cg_font and
+        cg_glyphs in struct MacFontStruct if synthesized bold or italic is
+        not used and font substitution never occurs for ASCII and Latin-1
+        characters.
+        (XLoadQueryFont): Maximum and minimum metrics are now those among
+        ASCII characters.
+        (XLoadQueryFont) [!MAC_OS8 || USE_ATSUI]: Apply WebKit-style
+        height adjustments for Courier, Helvetica, and Times.
+
+        * s/darwin.h (LIBS_CARBON) [!HAVE_CARBON]: Remove `-framework Carbon'.
+
+2005-11-11  David Reitter <david.reitter@gmail.com>
+
+        * macterm.c (syms_of_macterm): Remove macCtrlKey, macShiftKey,
+        macMetaKey, macAltKey. Introduce Qctrl, Qmeta,
+        Vmac_control_modifier / mac-control-modifier,
+        Vmac_option_modifier / mac-option-modifier,
+        Vmac_command_modifier / mac-command-modifier.
+        (mac_to_emacs_modifiers): Use the new style modifier
+        variables.  Return UInt32 (modifiers are longs now.)
+        (backtranslate_modified_keycode): New function (refactoring).
+        (XTread_socket): Use new modifier variables and refactored function.
+        (mac_determine_quit_char_modifiers): Remove macMetaKey (there is
+        no dedicated meta key.  Not in use anyway.)
+        (convert_fn_keycode): Map Fn-keys to their original keycode
+        using a table (english keyboard only).
+
+2005-11-11  Kim F. Storm  <storm@cua.dk>
+
+        * .gdbinit (pitx): Fix output format if n_overlay_strings > 0.
+        Add post hook to "backtrace" to always dump lisp call stack to
+        increase chance of people sending it to us when reporting bugs.
+
+        * doc.c (Fsubstitute_command_keys): Doc fix.
+
+        * dispextern.h (struct it): New member ignore_overlay_strings_at_pos_p.
+
+        * xdisp.c (handle_stop): Skip overlay string handling if
+        ignore_overlay_strings_at_pos_p is set.
+        (set_iterator_to_next): At end of display vector, set
+        ignore_overlay_strings_at_pos_p if dpvec came from an overlay
+        string, so we skip those overlay strings at current pos.
+
+2005-11-10  Lars Hansen <larsh@soem.dk>
+
+        * fileio.c (file-regular-p): Doc fix.
+
+2005-11-10  Kim F. Storm  <storm@cua.dk>
+
+        * alloc.c (valid_lisp_object_p): New function to validate that
+        an object is really a valid Lisp_Object.
+
+        * lisp.h (valid_lisp_object_p): Add prototype.
+
+        * print.c (safe_debug_print): New function to be called from gdb
+        to print Lisp objects; use valid_lisp_object_p to avoid crashing
+        if user tries to print something which is not a Lisp object.
+
+        * .gdbinit (pp, pp1): Use safe_debug_print.
+        (pv, pv1): New commands to print value of a lisp variable.
+
+2005-11-10  Nick Roberts  <nickrob@snap.net.nz>
+
+        * .gdbinit (pp1): New user-defined function.
+
+2005-11-09  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * image.c [MAC_OSX] (image_load_quartz2d): Fix memory leak.
+
+        * mac.c [MAC_OSX] (init_mac_osx_environment): Reinitialize locale
+        related variables for dumped executable.
+
+        * unexmacosx.c (unexec_write_zero): New function.
+        (copy_data_segment): Clear uninitialized local variables in
+        statically linked libraries.
+
+        * s/darwin.h (C_SWITCH_SYSTEM): Remove -fno-common.
+
+2005-11-09  Juri Linkov  <juri@jurta.org>
+
+        * keymap.c (shadow_lookup): If Flookup_key returns a number,
+        call it again with a sub-key-sequence, and if its return value
+        is non-nil (sub-key is bound), return nil.
+
+2005-11-08  Kim F. Storm  <storm@cua.dk>
+
+        * process.c (Fsignal_process): Recognize signal names with and
+        without SIG prefix, e.g. SIGHUP and HUP.
+
+        * search.c (search_buffer): No need to initialize base_pat.
+
 2005-11-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * window.c (Fget_lru_window, Fget_largest_window, window_loop):
@@ -179,7 +328,7 @@
         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.
+        (mac_draw_string_common) [USE_ATSUI && WORDS_BIG_ENDIAN]: Fix typo.
         Use EndianU16_BtoN.
         (mac_draw_string_common) [MAC_OSX]: Don't use ATSUClearLayoutControls.
         (x_per_char_metric, XLoadQueryFont)
diff --git a/src/Makefile.in b/src/Makefile.in
index 30dc5ab030d..7c9203d11ff 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -725,6 +725,7 @@ lisp= \
         ${lispsource}help.elc \
         ${lispsource}indent.elc \
         ${lispsource}isearch.elc \
+        ${lispsource}rfn-eshadow.elc \
         ${lispsource}loadup.el \
         ${lispsource}loaddefs.el \
         ${lispsource}bindings.elc \
@@ -821,6 +822,7 @@ shortlisp= \
         ../lisp/help.elc \
         ../lisp/indent.elc \
         ../lisp/isearch.elc \
+        ../lisp/rfn-eshadow.elc \
         ../lisp/loadup.el \
         ../lisp/loaddefs.el \
         ../lisp/bindings.elc \
diff --git a/src/alloc.c b/src/alloc.c
index 1e95447549b..bc48f7bb3b4 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2532,7 +2532,7 @@ void
 free_float (ptr)
      struct Lisp_Float *ptr;
 {
-  *(struct Lisp_Float **)&ptr->data = float_free_list;
+  ptr->u.chain = float_free_list;
   float_free_list = ptr;
 }
 
@@ -2550,7 +2550,7 @@ make_float (float_value)
       /* We use the data field for chaining the free list
          so that we won't use the same field that has the mark bit.  */
       XSETFLOAT (val, float_free_list);
-      float_free_list = *(struct Lisp_Float **)&float_free_list->data;
+      float_free_list = float_free_list->u.chain;
     }
   else
     {
@@ -2650,7 +2650,7 @@ void
 free_cons (ptr)
      struct Lisp_Cons *ptr;
 {
-  *(struct Lisp_Cons **)&ptr->cdr = cons_free_list;
+  ptr->u.chain = cons_free_list;
 #if GC_MARK_STACK
   ptr->car = Vdead;
 #endif
@@ -2669,7 +2669,7 @@ DEFUN ("cons", Fcons, Scons, 2, 2, 0,
       /* We use the cdr for chaining the free list
          so that we won't use the same field that has the mark bit.  */
       XSETCONS (val, cons_free_list);
-      cons_free_list = *(struct Lisp_Cons **)&cons_free_list->cdr;
+      cons_free_list = cons_free_list->u.chain;
     }
   else
     {
@@ -2704,7 +2704,7 @@ check_cons_list ()
   struct Lisp_Cons *tail = cons_free_list;
 
   while (tail)
-    tail = *(struct Lisp_Cons **)&tail->cdr;
+    tail = tail->u.chain;
 #endif
 }
 
@@ -3141,7 +3141,7 @@ Its value and function definition are void, and its property list is nil.  */)
   if (symbol_free_list)
     {
       XSETSYMBOL (val, symbol_free_list);
-      symbol_free_list = *(struct Lisp_Symbol **)&symbol_free_list->value;
+      symbol_free_list = symbol_free_list->next;
     }
   else
     {
@@ -4485,10 +4485,79 @@ mark_stack ()
 #endif
 }
 
-
 #endif /* GC_MARK_STACK != 0 */
 
 
+
+/* Return 1 if OBJ is a valid lisp object.
+   Return 0 if OBJ is NOT a valid lisp object.
+   Return -1 if we cannot validate OBJ.
+*/
+
+int
+valid_lisp_object_p (obj)
+     Lisp_Object obj;
+{
+#if !GC_MARK_STACK
+  /* Cannot determine this.  */
+  return -1;
+#else
+  void *p;
+  struct mem_node *m;
+
+  if (INTEGERP (obj))
+    return 1;
+
+  p = (void *) XPNTR (obj);
+
+  if (PURE_POINTER_P (p))
+    return 1;
+
+  m = mem_find (p);
+
+  if (m == MEM_NIL)
+    return 0;
+
+  switch (m->type)
+    {
+    case MEM_TYPE_NON_LISP:
+      return 0;
+
+    case MEM_TYPE_BUFFER:
+      return live_buffer_p (m, p);
+
+    case MEM_TYPE_CONS:
+      return live_cons_p (m, p);
+
+    case MEM_TYPE_STRING:
+      return live_string_p (m, p);
+
+    case MEM_TYPE_MISC:
+      return live_misc_p (m, p);
+
+    case MEM_TYPE_SYMBOL:
+      return live_symbol_p (m, p);
+
+    case MEM_TYPE_FLOAT:
+      return live_float_p (m, p);
+
+    case MEM_TYPE_VECTOR:
+    case MEM_TYPE_PROCESS:
+    case MEM_TYPE_HASH_TABLE:
+    case MEM_TYPE_FRAME:
+    case MEM_TYPE_WINDOW:
+      return live_vector_p (m, p);
+
+    default:
+      break;
+    }
+
+  return 0;
+#endif
+}
+
+
+
 
 /***********************************************************************
                        Pure Storage Management
@@ -4969,7 +5038,7 @@ returns nil, because real GC can't be done.  */)
       total += total_floats  * sizeof (struct Lisp_Float);
       total += total_intervals * sizeof (struct interval);
       total += total_strings * sizeof (struct Lisp_String);
-      
+
       gc_relative_threshold = total * XFLOAT_DATA (Vgc_cons_percentage);
     }
   else
@@ -5496,14 +5565,14 @@ mark_object (arg)
         CHECK_ALLOCATED_AND_LIVE (live_cons_p);
         CONS_MARK (ptr);
         /* If the cdr is nil, avoid recursion for the car.  */
-        if (EQ (ptr->cdr, Qnil))
+        if (EQ (ptr->u.cdr, Qnil))
           {
             obj = ptr->car;
             cdr_count = 0;
             goto loop;
           }
         mark_object (ptr->car);
-        obj = ptr->cdr;
+        obj = ptr->u.cdr;
         cdr_count++;
         if (cdr_count == mark_object_loop_halt)
           abort ();
@@ -5650,7 +5719,7 @@ gc_sweep ()
           if (!CONS_MARKED_P (&cblk->conses[i]))
             {
               this_free++;
-              *(struct Lisp_Cons **)&cblk->conses[i].cdr = cons_free_list;
+              cblk->conses[i].u.chain = cons_free_list;
               cons_free_list = &cblk->conses[i];
 #if GC_MARK_STACK
               cons_free_list->car = Vdead;
@@ -5669,7 +5738,7 @@ gc_sweep ()
           {
             *cprev = cblk->next;
             /* Unhook from the free list.  */
-            cons_free_list = *(struct Lisp_Cons **) &cblk->conses[0].cdr;
+            cons_free_list = cblk->conses[0].u.chain;
             lisp_align_free (cblk);
             n_cons_blocks--;
           }
@@ -5700,7 +5769,7 @@ gc_sweep ()
           if (!FLOAT_MARKED_P (&fblk->floats[i]))
             {
               this_free++;
-              *(struct Lisp_Float **)&fblk->floats[i].data = float_free_list;
+              fblk->floats[i].u.chain = float_free_list;
               float_free_list = &fblk->floats[i];
             }
           else
@@ -5716,7 +5785,7 @@ gc_sweep ()
           {
             *fprev = fblk->next;
             /* Unhook from the free list.  */
-            float_free_list = *(struct Lisp_Float **) &fblk->floats[0].data;
+            float_free_list = fblk->floats[0].u.chain;
             lisp_align_free (fblk);
             n_float_blocks--;
           }
@@ -5804,7 +5873,7 @@ gc_sweep ()
 
             if (!sym->gcmarkbit && !pure_p)
               {
-                *(struct Lisp_Symbol **) &sym->value = symbol_free_list;
+                sym->next = symbol_free_list;
                 symbol_free_list = sym;
 #if GC_MARK_STACK
                 symbol_free_list->function = Vdead;
@@ -5828,7 +5897,7 @@ gc_sweep ()
           {
             *sprev = sblk->next;
             /* Unhook from the free list.  */
-            symbol_free_list = *(struct Lisp_Symbol **)&sblk->symbols[0].value;
+            symbol_free_list = sblk->symbols[0].next;
             lisp_free (sblk);
             n_symbol_blocks--;
           }
diff --git a/src/dispextern.h b/src/dispextern.h
index 078726aa5c8..f5573efdcc4 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1974,6 +1974,10 @@ struct it
   /* 1 means overlay strings at end_charpos have been processed.  */
   unsigned overlay_strings_at_end_processed_p : 1;
 
+  /* 1 means to ignore overlay strings at current pos, as they have
+     already been processed.  */
+  unsigned ignore_overlay_strings_at_pos_p : 1;
+
   /* 1 means the actual glyph is not available in the current
      system.  */
   unsigned glyph_not_available_p : 1;
diff --git a/src/doc.c b/src/doc.c
index a31c53d5b21..0566c5f9d06 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -735,15 +735,18 @@ the same file name is found in the `doc-directory'.  */)
 DEFUN ("substitute-command-keys", Fsubstitute_command_keys,
        Ssubstitute_command_keys, 1, 1, 0,
        doc: /* Substitute key descriptions for command names in STRING.
-Return a new string which is STRING with substrings of the form \\=\\[COMMAND]
-replaced by either:  a keystroke sequence that will invoke COMMAND,
-or "M-x COMMAND" if COMMAND is not on any keys.
+Substrings of the form \\=\\[COMMAND] replaced by either: a keystroke
+sequence that will invoke COMMAND, or "M-x COMMAND" if COMMAND is not
+on any keys.
 Substrings of the form \\=\\{MAPVAR} are replaced by summaries
 \(made by describe-bindings) of the value of MAPVAR, taken as a keymap.
 Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR
 as the keymap for future \\=\\[COMMAND] substrings.
 \\=\\= quotes the following character and is discarded;
-thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output.  */)
+thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output.
+
+Returns original STRING if no substitutions were made.  Othwerwise,
+a new string, without any text properties, is returned.  */)
      (string)
      Lisp_Object string;
 {
diff --git a/src/fileio.c b/src/fileio.c
index 6806c7d025a..b7262b6c58b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3394,8 +3394,10 @@ searchable directory.  */)
 }
 
 DEFUN ("file-regular-p", Ffile_regular_p, Sfile_regular_p, 1, 1, 0,
-       doc: /* Return t if file FILENAME is the name of a regular file.
-This is the sort of file that holds an ordinary stream of data bytes.  */)
+       doc: /* Return t if FILENAME names a regular file.
+This is the sort of file that holds an ordinary stream of data bytes.
+Symbolic links to regular files count as regular files.
+See `file-symlink-p' to distinguish symlinks.  */)
      (filename)
      Lisp_Object filename;
 {
diff --git a/src/gnu.h b/src/gnu.h
index 1d623431af8..dbf47317493 100644
--- a/src/gnu.h
+++ b/src/gnu.h
@@ -1,6 +1,216 @@
-#define gnu_width 50
-#define gnu_height 50
-static unsigned char gnu_bits[] = {
+#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
+static char * gnu_xpm_bits[] = {
+"32 32 173 2",
+"       c None",
+".      c #67627D",
+"+      c #5F5A76",
+"@      c #78748C",
+"#      c #DCDBE1",
+"$      c #CFCED7",
+"%      c #B8B5C7",
+"&      c #ADA9C1",
+"*      c #A6A3B9",
+"=      c #9995A9",
+"-      c #878398",
+";      c #C2C0CD",
+">      c #9591AE",
+",      c #9B97B3",
+"'      c #BDBACC",
+")      c #9C98B3",
+"!      c #A9A6B9",
+"~      c #8D89A0",
+"{      c #A9A5BC",
+"]      c #938FAB",
+"^      c #B4B2C5",
+"/      c #F8F8FA",
+"(      c #E4E3EA",
+"_      c #BCB9CB",
+":      c #9390A5",
+"<      c #5E5A75",
+"[      c #8B87A1",
+"}      c #918DA9",
+"|      c #BAB7C9",
+"1      c #FFFFFF",
+"2      c #F1F1F4",
+"3      c #B4B1C4",
+"4      c #9D99AF",
+"5      c #5D5974",
+"6      c #8E8AA5",
+"7      c #A3A0B6",
+"8      c #F8F8F9",
+"9      c #9F9CB3",
+"0      c #8C88A3",
+"a      c #938FA9",
+"b      c #C6C4D1",
+"c      c #B7B4C5",
+"d      c #9D99B1",
+"e      c #5C5873",
+"f      c #8985A0",
+"g      c #B5B3C4",
+"h      c #F0F0F3",
+"i      c #A6A3B7",
+"j      c #9B98AE",
+"k      c #5C5872",
+"l      c #88849D",
+"m      c #A6A3B6",
+"n      c #F8F7F9",
+"o      c #C3C1CE",
+"p      c #9996AB",
+"q      c #5B5772",
+"r      c #85819A",
+"s      c #9491A7",
+"t      c #E0DFE6",
+"u      c #C2C0CC",
+"v      c #8C88A0",
+"w      c #9894A9",
+"x      c #5A5671",
+"y      c #838097",
+"z      c #B2B0BE",
+"A      c #F7F7F8",
+"B      c #D8D7DE",
+"C      c #928FA4",
+"D      c #9491A5",
+"E      c #5A5670",
+"F      c #817D95",
+"G      c #A9A6B6",
+"H      c #A8A5B6",
+"I      c #928FA3",
+"J      c #59556F",
+"K      c #7E7B91",
+"L      c #BEBDC8",
+"M      c #AEACBA",
+"N      c #908DA0",
+"O      c #5B5771",
+"P      c #58546D",
+"Q      c #65617A",
+"R      c #E0DFE4",
+"S      c #8E8B9E",
+"T      c #7A778D",
+"U      c #5A566F",
+"V      c #57536C",
+"W      c #58546F",
+"X      c #A19EAE",
+"Y      c #EAEAED",
+"Z      c #F5F4F6",
+"`      c #A19FAE",
+" .     c #625F78",
+"..     c #77748A",
+"+.     c #59556E",
+"@.     c #56526B",
+"#.     c #807D90",
+"$.     c #D5D4DA",
+"%.     c #9693A3",
+"&.     c #767387",
+"*.     c #55516A",
+"=.     c #534F68",
+"-.     c #9491A1",
+";.     c #F4F4F6",
+">.     c #9E9CAA",
+",.     c #5D5971",
+"'.     c #737084",
+").     c #545068",
+"!.     c #504D64",
+"~.     c #F4F4F5",
+"{.     c #DEDDE2",
+"].     c #5A576D",
+"^.     c #716F81",
+"/.     c #56526A",
+"(.     c #524F67",
+"_.     c #4D4A61",
+":.     c #9A99A6",
+"<.     c #848292",
+"[.     c #6F6C7F",
+"}.     c #545169",
+"|.     c #514E65",
+"1.     c #4A475D",
+"2.     c #6B697B",
+"3.     c #D2D1D6",
+"4.     c #F4F3F5",
+"5.     c #9998A4",
+"6.     c #6C6A7B",
+"7.     c #535067",
+"8.     c #504C64",
+"9.     c #474459",
+"0.     c #747282",
+"a.     c #D1D0D5",
+"b.     c #E8E8EA",
+"c.     c #8C8A97",
+"d.     c #676576",
+"e.     c #4E4B62",
+"f.     c #444156",
+"g.     c #727080",
+"h.     c #E8E7EA",
+"i.     c #8A8996",
+"j.     c #656374",
+"k.     c #524F66",
+"l.     c #423F53",
+"m.     c #B8B7BE",
+"n.     c #D0CFD4",
+"o.     c #4E4B5E",
+"p.     c #636171",
+"q.     c #4C485E",
+"r.     c #434054",
+"s.     c #3F3C4F",
+"t.     c #575465",
+"u.     c #CFCED3",
+"v.     c #646272",
+"w.     c #504C62",
+"x.     c #4B475D",
+"y.     c #3D3A4C",
+"z.     c #494657",
+"A.     c #7A7884",
+"B.     c #B7B6BC",
+"C.     c #DADADD",
+"D.     c #4F4B61",
+"E.     c #49455B",
+"F.     c #3A3748",
+"G.     c #5E5C6A",
+"H.     c #908E98",
+"I.     c #C1C0C6",
+"J.     c #F3F2F4",
+"K.     c #777581",
+"L.     c #474458",
+"M.     c #434053",
+"N.     c #3C3A4A",
+"O.     c #373544",
+"P.     c #454256",
+"                                                                ",
+"                                                                ",
+"        . + + + + + + + + + + + + + + + + + + + + + + +         ",
+"      @ # $ % & & & & & & & & & & & & & & & & & & * = @ +       ",
+"    @ - ; > > > > > > > > > > , ' ' ) > > > > > > > > ! . +     ",
+"    @ ~ { ] ] ] ] ] ] ] ] ] ] ] ] ^ / ( _ ] ] ] ] ] ] ] : <     ",
+"    . [ } } } } } } } } } } } } } } | 1 1 2 3 } } } } } 4 <     ",
+"    5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 7 8 1 1 1 8 6 6 6 6 6 9 5     ",
+"    5 0 0 0 0 0 0 0 0 0 0 0 0 a b 8 1 1 1 1 c 0 0 0 0 0 d 5     ",
+"    e f f f f f f f f f f f g h 1 1 1 1 h i f f f f f f j e     ",
+"    k l l l l l l l l l m h 1 1 1 1 n o l l l l l l l l p k     ",
+"    q r r r r r r r s t 1 1 1 1 1 u v r r r r r r r r r w q     ",
+"    x y y y y y y z A 1 1 1 1 B C y y y y y y y y y y y D e     ",
+"    E F F F F F G 1 1 1 1 A H F F F F F F F F F F F F F I k     ",
+"    J K K K K K L 1 1 1 1 M K K K K K K K K K K K K K K N O     ",
+"    P q q q q q Q R 1 1 1 S q q q q q q q q q q q q q q T U     ",
+"    V W W W W W W W X Y 1 Z `  .W W W W W W W W W W W W ..+.    ",
+"    @.@.@.@.@.@.@.#.$.1 1 1 1 1 %.@.@.@.@.@.@.@.@.@.@.@.&.P     ",
+"    *.=.=.=.=.=.-.1 1 1 1 ;.>.,.=.=.=.=.=.=.=.=.=.=.=.=.'.V     ",
+"    ).!.!.!.!.!.~.1 1 1 {.].!.!.!.!.!.!.!.!.!.!.!.!.!.!.^./.    ",
+"    (._._._._._.:.1 1 1 <._._._._._._._._._._._._._._._.[.}.    ",
+"    |.1.1.1.1.1.1.2.3.1 4.5.1.1.1.1.1.1.1.1.1.1.1.1.1.1.6.7.    ",
+"    8.9.9.9.9.9.9.9.9.0.a.1 b.c.9.9.9.9.9.9.9.9.9.9.9.9.d.).    ",
+"    e.f.f.f.f.f.f.f.f.f.f.g.h.1 h.i.f.f.f.f.f.f.f.f.f.f.j.k.    ",
+"    _.l.l.l.l.l.l.l.l.l.l.l.l.m.1 1 n.o.l.l.l.l.l.l.l.l.p.|.    ",
+"    q.r.s.s.s.s.s.s.s.s.s.s.s.t.1 1 1 u.s.s.s.s.s.s.s.s.v.w.    ",
+"    x.9.y.y.y.y.y.y.y.y.z.A.B.1 1 1 1 C.y.y.y.y.y.y.y.y.d.D.    ",
+"    E.E.r.F.F.F.F.F.F.F.F.G.H.I.J.I.K.F.F.F.F.F.F.F.F.r.E.E.    ",
+"      L.L.M.N.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.N.M.L.L.      ",
+"        P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.        ",
+"                                                                ",
+"                                                                "};
+#endif /* defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) */
+
+#define gnu_xbm_width 50
+#define gnu_xbm_height 50
+static unsigned char gnu_xbm_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00,
diff --git a/src/image.c b/src/image.c
index fb3cdecaa54..1ba1cd197ff 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2549,6 +2549,7 @@ image_load_quartz2d (f, img, png_p)
 
   if (!check_image_size (f, width, height))
     {
+      CGImageRelease (image);
       UNGCPRO;
       image_error ("Invalid image size", Qnil, Qnil);
       return 0;
@@ -3715,6 +3716,45 @@ xpm_image_p (object)
 
 #endif /* HAVE_XPM || MAC_OS */
 
+#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
+int
+x_create_bitmap_from_xpm_data (f, bits)
+     struct frame *f;
+     char **bits;
+{
+  Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
+  int id, rc;
+  XpmAttributes attrs;
+  Pixmap bitmap, mask;
+
+  bzero (&attrs, sizeof attrs);
+
+  attrs.visual = FRAME_X_VISUAL (f);
+  attrs.colormap = FRAME_X_COLORMAP (f);
+  attrs.valuemask |= XpmVisual;
+  attrs.valuemask |= XpmColormap;
+
+  rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+                                bits, &bitmap, &mask, &attrs);
+  if (rc != XpmSuccess)
+    return -1;
+
+  id = x_allocate_bitmap_record (f);
+
+  dpyinfo->bitmaps[id - 1].pixmap = bitmap;
+  dpyinfo->bitmaps[id - 1].have_mask = 1;
+  dpyinfo->bitmaps[id - 1].mask = mask;
+  dpyinfo->bitmaps[id - 1].file = NULL;
+  dpyinfo->bitmaps[id - 1].height = attrs.height;
+  dpyinfo->bitmaps[id - 1].width = attrs.width;
+  dpyinfo->bitmaps[id - 1].depth = attrs.depth;
+  dpyinfo->bitmaps[id - 1].refcount = 1;
+
+  XpmFreeAttributes (&attrs);
+  return id;
+}
+#endif /* HAVE_X_WINDOWS */
+
 /* Load image IMG which will be displayed on frame F.  Value is
    non-zero if successful.  */
 
@@ -3762,6 +3802,9 @@ xpm_load (f, img)
   attrs.valuemask |= XpmCloseness;
 #endif /* not XpmAllocCloseColors */
 #endif /* ALLOC_XPM_COLORS */
+#ifdef ALLOC_XPM_COLORS
+  xpm_init_color_cache (f, &attrs);
+#endif
 
   /* If image specification contains symbolic color definitions, add
      these to `attrs'.  */
@@ -8457,7 +8500,8 @@ init_image ()
 {
 #ifdef MAC_OS
   /* Animated gifs use QuickTime Movie Toolbox.  So initialize it here. */
-  EnterMovies ();
+  if (!inhibit_window_system)
+    EnterMovies ();
 #ifdef MAC_OSX
   init_image_func_pointer ();
 #endif
diff --git a/src/keymap.c b/src/keymap.c
index 7e5b00bc771..a19b0102127 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2370,7 +2370,13 @@ shadow_lookup (shadow, key, flag)
   for (tail = shadow; CONSP (tail); tail = XCDR (tail))
     {
       value = Flookup_key (XCAR (tail), key, flag);
-      if (!NILP (value) && !NATNUMP (value))
+      if (NATNUMP (value))
+        {
+          value = Flookup_key (XCAR (tail), Fsubstring (key, 0, value), flag);
+          if (!NILP (value))
+            return Qnil;
+        }
+      else if (!NILP (value))
         return value;
     }
   return Qnil;
diff --git a/src/lisp.h b/src/lisp.h
index adf53035e98..767e97a94a6 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -600,9 +600,19 @@ struct Lisp_Cons
     /* Please do not use the names of these elements in code other
        than the core lisp implementation.  Use XCAR and XCDR below.  */
 #ifdef HIDE_LISP_IMPLEMENTATION
-    Lisp_Object car_, cdr_;
+    Lisp_Object car_;
+    union
+    {
+      Lisp_Object cdr_;
+      struct Lisp_Cons *chain;
+    } u;
 #else
-    Lisp_Object car, cdr;
+    Lisp_Object car;
+    union
+    {
+      Lisp_Object cdr;
+      struct Lisp_Cons *chain;
+    } u;
 #endif
   };
 
@@ -615,10 +625,10 @@ struct Lisp_Cons
    invalidated at arbitrary points.)  */
 #ifdef HIDE_LISP_IMPLEMENTATION
 #define XCAR_AS_LVALUE(c) (XCONS ((c))->car_)
-#define XCDR_AS_LVALUE(c) (XCONS ((c))->cdr_)
+#define XCDR_AS_LVALUE(c) (XCONS ((c))->u.cdr_)
 #else
 #define XCAR_AS_LVALUE(c) (XCONS ((c))->car)
-#define XCDR_AS_LVALUE(c) (XCONS ((c))->cdr)
+#define XCDR_AS_LVALUE(c) (XCONS ((c))->u.cdr)
 #endif
 
 /* Use these from normal code.  */
@@ -1275,17 +1285,21 @@ union Lisp_Misc
 /* Lisp floating point type */
 struct Lisp_Float
   {
+    union
+    {
 #ifdef HIDE_LISP_IMPLEMENTATION
-    double data_;
+      double data_;
 #else
-    double data;
+      double data;
 #endif
+      struct Lisp_Float *chain;
+    } u;
   };
 
 #ifdef HIDE_LISP_IMPLEMENTATION
-#define XFLOAT_DATA(f)  (XFLOAT (f)->data_)
+#define XFLOAT_DATA(f)  (XFLOAT (f)->u.data_)
 #else
-#define XFLOAT_DATA(f)  (XFLOAT (f)->data)
+#define XFLOAT_DATA(f)  (XFLOAT (f)->u.data)
 #endif
 
 /* A character, declared with the following typedef, is a member
@@ -2549,6 +2563,7 @@ extern void init_alloc_once P_ ((void));
 extern void init_alloc P_ ((void));
 extern void syms_of_alloc P_ ((void));
 extern struct buffer * allocate_buffer P_ ((void));
+extern int valid_lisp_object_p P_ ((Lisp_Object));
 
 /* Defined in print.c */
 extern Lisp_Object Vprin1_to_string_buffer;
diff --git a/src/lread.c b/src/lread.c
index 1bae0ea7ddd..234fbe6e395 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1317,7 +1317,7 @@ readevalloop (readcharfun, stream, sourcename, evalfun,
   register int c;
   register Lisp_Object val;
   int count = SPECPDL_INDEX ();
-  struct gcpro gcpro1;
+  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   struct buffer *b = 0;
   int continue_reading_p;
 
@@ -1326,14 +1326,14 @@ readevalloop (readcharfun, stream, sourcename, evalfun,
   else if (MARKERP (readcharfun))
     b = XMARKER (readcharfun)->buffer;
 
-  specbind (Qstandard_input, readcharfun);
+  specbind (Qstandard_input, readcharfun); /* GCPROs readcharfun.  */
   specbind (Qcurrent_load_list, Qnil);
   record_unwind_protect (readevalloop_1, load_convert_to_unibyte ? Qt : Qnil);
   load_convert_to_unibyte = !NILP (unibyte);
 
   readchar_backlog = -1;
 
-  GCPRO1 (sourcename);
+  GCPRO4 (sourcename, readfun, start, end);
 
   LOADHIST_ATTACH (sourcename);
 
diff --git a/src/mac.c b/src/mac.c
index 4c8e78ade25..2493945727d 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -854,9 +854,14 @@ parse_resource_line (p)
    implemented as a hash table that maps a pair (SRC-NODE-ID .
    EDGE-LABEL) to DEST-NODE-ID.  It also holds a maximum node id used
    in the table as a value for HASHKEY_MAX_NID.  A value associated to
-   a node is recorded as a value for the node id.  */
+   a node is recorded as a value for the node id.
+
+   A database also has a cache for past queries as a value for
+   HASHKEY_QUERY_CACHE.  It is another hash table that maps
+   "NAME-STRING\0CLASS-STRING" to the result of the query.  */
 
 #define HASHKEY_MAX_NID (make_number (0))
+#define HASHKEY_QUERY_CACHE (make_number (-1))
 
 static XrmDatabase
 xrm_create_database ()
@@ -868,6 +873,7 @@ xrm_create_database ()
                               make_float (DEFAULT_REHASH_THRESHOLD),
                               Qnil, Qnil, Qnil);
   Fputhash (HASHKEY_MAX_NID, make_number (0), database);
+  Fputhash (HASHKEY_QUERY_CACHE, Qnil, database);
 
   return database;
 }
@@ -901,6 +907,7 @@ xrm_q_put_resource (database, quarks, value)
   Fputhash (node_id, value, database);
 
   Fputhash (HASHKEY_MAX_NID, make_number (max_nid), database);
+  Fputhash (HASHKEY_QUERY_CACHE, Qnil, database);
 }
 
 /* Merge multiple resource entries specified by DATA into a resource
@@ -989,8 +996,30 @@ xrm_get_resource (database, name, class)
      XrmDatabase database;
      char *name, *class;
 {
-  Lisp_Object quark_name, quark_class, tmp;
-  int nn, nc;
+  Lisp_Object key, query_cache, quark_name, quark_class, tmp;
+  int i, nn, nc;
+  struct Lisp_Hash_Table *h;
+  unsigned hash_code;
+
+  nn = strlen (name);
+  nc = strlen (class);
+  key = make_uninit_string (nn + nc + 1);
+  strcpy (SDATA (key), name);
+  strncpy (SDATA (key) + nn + 1, class, nc);
+
+  query_cache = Fgethash (HASHKEY_QUERY_CACHE, database, Qnil);
+  if (NILP (query_cache))
+    {
+      query_cache = make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE),
+                                     make_float (DEFAULT_REHASH_SIZE),
+                                     make_float (DEFAULT_REHASH_THRESHOLD),
+                                     Qnil, Qnil, Qnil);
+      Fputhash (HASHKEY_QUERY_CACHE, query_cache, database);
+    }
+  h = XHASH_TABLE (query_cache);
+  i = hash_lookup (h, key, &hash_code);
+  if (i >= 0)
+    return HASH_VALUE (h, i);
 
   quark_name = parse_resource_name (&name);
   if (*name != '\0')
@@ -1009,7 +1038,11 @@ xrm_get_resource (database, name, class)
   if (nn != nc)
     return Qnil;
   else
-    return xrm_q_get_resource (database, quark_name, quark_class);
+    {
+      tmp = xrm_q_get_resource (database, quark_name, quark_class);
+      hash_put (h, key, tmp, hash_code);
+      return tmp;
+    }
 }
 
 #if TARGET_API_MAC_CARBON
@@ -4119,7 +4152,7 @@ DEFUN ("mac-code-convert-string", Fmac_code_convert_string, Smac_code_convert_st
 The conversion is performed using the converter provided by the system.
 Each encoding is specified by either a coding system symbol, a mime
 charset string, or an integer as a CFStringEncoding value.  Nil for
-encoding means UTF-16 in native byte order, no byte order marker.
+encoding means UTF-16 in native byte order, no byte order mark.
 On Mac OS X 10.2 and later, you can do Unicode Normalization by
 specifying the optional argument NORMALIZATION-FORM with a symbol NFD,
 NFKD, NFC, NFKC, HFS+D, or HFS+C.
@@ -4192,6 +4225,29 @@ DEFUN ("mac-clear-font-name-table", Fmac_clear_font_name_table, Smac_clear_font_
   return Qnil;
 }
 
+
+static Lisp_Object
+mac_get_system_locale ()
+{
+  OSErr err;
+  LangCode lang;
+  RegionCode region;
+  LocaleRef locale;
+  Str255 str;
+
+  lang = GetScriptVariable (smSystemScript, smScriptLang);
+  region = GetScriptManagerVariable (smRegionCode);
+  err = LocaleRefFromLangOrRegionCode (lang, region, &locale);
+  if (err == noErr)
+    err = LocaleRefGetPartString (locale, kLocaleAllPartsMask,
+                                  sizeof (str), str);
+  if (err == noErr)
+    return build_string (str);
+  else
+    return Qnil;
+}
+
+
 #ifdef MAC_OSX
 #undef select
 
@@ -4213,7 +4269,7 @@ extern int noninteractive;
       involved, and timeout is not too short (greater than
       SELECT_TIMEOUT_THRESHHOLD_RUNLOOP seconds).
       -> Create CFSocket for each socket and add it into the current
-         event RunLoop so that an `ready-to-read' event can be posted
+         event RunLoop so that a `ready-to-read' event can be posted
          to the event queue that is also used for window events.  Then
          ReceiveNextEvent can wait for both kinds of inputs.
    4. Otherwise.
@@ -4481,6 +4537,11 @@ init_mac_osx_environment ()
   char *p, *q;
   struct stat st;
 
+  /* Initialize locale related variables.  */
+  mac_system_script_code =
+    (ScriptCode) GetScriptManagerVariable (smSysScript);
+  Vmac_system_locale = mac_get_system_locale ();
+
   /* Fetch the pathname of the application bundle as a C string into
      app_bundle_pathname.  */
 
@@ -4600,28 +4661,6 @@ init_mac_osx_environment ()
 #endif /* MAC_OSX */
 
 
-static Lisp_Object
-mac_get_system_locale ()
-{
-  OSErr err;
-  LangCode lang;
-  RegionCode region;
-  LocaleRef locale;
-  Str255 str;
-
-  lang = GetScriptVariable (smSystemScript, smScriptLang);
-  region = GetScriptManagerVariable (smRegionCode);
-  err = LocaleRefFromLangOrRegionCode (lang, region, &locale);
-  if (err == noErr)
-    err = LocaleRefGetPartString (locale, kLocaleAllPartsMask,
-                                  sizeof (str), str);
-  if (err == noErr)
-    return build_string (str);
-  else
-    return Qnil;
-}
-
-
 void
 syms_of_mac ()
 {
diff --git a/src/macgui.h b/src/macgui.h
index 6e2adb092c6..40244dbc7c6 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -92,6 +92,12 @@ typedef GWorldPtr Pixmap;
 #endif
 
 
+#ifndef USE_CG_TEXT_DRAWING
+#if USE_ATSUI && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
+#define USE_CG_TEXT_DRAWING 1
+#endif
+#endif
+
 /* Emulate XCharStruct.  */
 typedef struct _XCharStruct
 {
@@ -127,6 +133,10 @@ struct MacFontStruct {
 #endif
 #if USE_ATSUI
   ATSUStyle mac_style;          /* NULL if QuickDraw Text is used */
+#if USE_CG_TEXT_DRAWING
+  CGFontRef cg_font;            /* NULL if ATSUI text drawing is used */
+  CGGlyph *cg_glyphs;           /* Likewise  */
+#endif
 #endif
 
 /* from Xlib.h */
diff --git a/src/macterm.c b/src/macterm.c
index 70120bdf59d..169e3d60855 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -87,14 +87,6 @@ Boston, MA 02110-1301, USA.  */
 #include "atimer.h"
 #include "keymap.h"
 
-/* Set of macros that handle mapping of Mac modifier keys to emacs.  */
-#define macCtrlKey     (NILP (Vmac_reverse_ctrl_meta) ? controlKey :    \
-                        (NILP (Vmac_command_key_is_meta) ? optionKey : cmdKey))
-#define macShiftKey    (shiftKey)
-#define macMetaKey     (NILP (Vmac_reverse_ctrl_meta) ?                 \
-                        (NILP (Vmac_command_key_is_meta) ? optionKey : cmdKey) \
-                        : controlKey)
-#define macAltKey      (NILP (Vmac_command_key_is_meta) ? cmdKey : optionKey)
 
 
 /* Non-nil means Emacs uses toolkit scroll bars.  */
@@ -207,7 +199,8 @@ extern EMACS_INT extra_keyboard_modifiers;
 
 /* The keysyms to use for the various modifiers.  */
 
-static Lisp_Object Qalt, Qhyper, Qsuper, Qmodifier_value;
+static Lisp_Object Qalt, Qhyper, Qsuper, Qctrl,
+  Qmeta, Qmodifier_value;
 
 extern int inhibit_window_system;
 
@@ -778,7 +771,7 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, mode, bytes_per_char)
               QDEndCGContext (port, &context);
 #if 0
               /* This doesn't work on Mac OS X 10.1.  */
-              ATSUClearLayoutControls (text_layout, 
+              ATSUClearLayoutControls (text_layout,
                                        sizeof (tags) / sizeof (tags[0]),
                                        tags);
 #else
@@ -871,6 +864,77 @@ 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
+mac_draw_string_cg (f, gc, x, y, buf, nchars)
+     struct frame *f;
+     GC gc;
+     int x, y;
+     XChar2b *buf;
+     int nchars;
+{
+  CGrafPtr port;
+  float port_height, gx, gy;
+  int i;
+  CGContextRef context;
+  CGGlyph *glyphs;
+  CGSize *advances;
+
+  if (NILP (Vmac_use_core_graphics) || GC_FONT (gc)->cg_font == NULL)
+    return 0;
+
+  port = GetWindowPort (FRAME_MAC_WINDOW (f));
+  port_height = FRAME_PIXEL_HEIGHT (f);
+  gx = x;
+  gy = port_height - y;
+  glyphs = (CGGlyph *)buf;
+  advances = xmalloc (sizeof (CGSize) * nchars);
+  for (i = 0; i < nchars; i++)
+    {
+      advances[i].width = x_per_char_metric (GC_FONT (gc), buf)->width;
+      advances[i].height = 0;
+      glyphs[i] = GC_FONT (gc)->cg_glyphs[buf->byte2];
+      buf++;
+    }
+
+  QDBeginCGContext (port, &context);
+  if (gc->n_clip_rects)
+    {
+      CGContextTranslateCTM (context, 0, port_height);
+      CGContextScaleCTM (context, 1, -1);
+      CGContextClipToRects (context, gc->clip_rects, gc->n_clip_rects);
+      CGContextScaleCTM (context, 1, -1);
+      CGContextTranslateCTM (context, 0, -port_height);
+    }
+  CGContextSetRGBFillColor (context,
+                            RED_FROM_ULONG (gc->xgcv.foreground) / 255.0,
+                            GREEN_FROM_ULONG (gc->xgcv.foreground) / 255.0,
+                            BLUE_FROM_ULONG (gc->xgcv.foreground) / 255.0,
+                            1.0);
+  CGContextSetFont (context, GC_FONT (gc)->cg_font);
+  CGContextSetFontSize (context, GC_FONT (gc)->mac_fontsize);
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
+  CGContextSetTextPosition (context, gx, gy);
+  CGContextShowGlyphsWithAdvances (context, glyphs, advances, nchars);
+#else
+  for (i = 0; i < nchars; i++)
+    {
+      CGContextShowGlyphsAtPoint (context, gx, gy, glyphs + i, 1);
+      gx += advances[i].width;
+    }
+#endif
+  CGContextSynchronize (context);
+  QDEndCGContext (port, &context);
+
+  xfree (advances);
+
+  return 1;
+}
+#endif
+
+
 /* Mac replacement for XCopyArea: dest must be window.  */
 
 static void
@@ -2265,6 +2329,13 @@ x_draw_glyph_string_foreground (s)
               || GC_FONT (s->gc)->mac_style
 #endif
               )
+#if USE_CG_TEXT_DRAWING
+            if (!s->two_byte_p
+                && mac_draw_string_cg (s->f, s->gc, x, s->ybase - boff,
+                                       s->char2b, s->nchars))
+              ;
+            else
+#endif
             mac_draw_string_16 (s->f, s->gc, x, s->ybase - boff,
                                 s->char2b, s->nchars);
           else
@@ -7288,6 +7359,7 @@ XLoadQueryFont (Display *dpy, char *fontname)
   Str31 charset;
   SInt16 fontnum;
 #if USE_ATSUI
+  static ATSUFontID font_id;
   ATSUStyle mac_style = NULL;
 #endif
   Style fontface;
@@ -7322,7 +7394,6 @@ XLoadQueryFont (Display *dpy, char *fontname)
                                  kATSUQDBoldfaceTag, kATSUQDItalicTag};
       ByteCount sizes[] = {sizeof (ATSUFontID), sizeof (Fixed),
                            sizeof (Boolean), sizeof (Boolean)};
-      static ATSUFontID font_id;
       static Fixed size_fixed;
       static Boolean bold_p, italic_p;
       ATSUAttributeValuePtr values[] = {&font_id, &size_fixed,
@@ -7376,6 +7447,10 @@ XLoadQueryFont (Display *dpy, char *fontname)
   font->mac_scriptcode = scriptcode;
 #if USE_ATSUI
   font->mac_style = mac_style;
+#if USE_CG_TEXT_DRAWING
+  font->cg_font = NULL;
+  font->cg_glyphs = NULL;
+#endif
 #endif
 
   /* Apple Japanese (SJIS) font is listed as both
@@ -7405,6 +7480,30 @@ XLoadQueryFont (Display *dpy, char *fontname)
         }
       bzero (font->per_char, sizeof (XCharStruct) * 0x10000);
 
+#if USE_CG_TEXT_DRAWING
+      {
+        FMFontFamily font_family;
+        FMFontStyle style;
+        ATSFontRef ats_font;
+
+        err = FMGetFontFamilyInstanceFromFont (font_id, &font_family, &style);
+        if (err == noErr)
+          err = FMGetFontFromFontFamilyInstance (font_family, fontface,
+                                                 &font_id, &style);
+        /* Use CG text drawing if italic/bold is not synthesized.  */
+        if (err == noErr && style == fontface)
+          {
+            ats_font = FMGetATSFontRefFromFont (font_id);
+            font->cg_font = CGFontCreateWithPlatformFont (&ats_font);
+          }
+      }
+
+      if (font->cg_font)
+        font->cg_glyphs = xmalloc (sizeof (CGGlyph) * 0x100);
+      if (font->cg_glyphs)
+        bzero (font->cg_glyphs, sizeof (CGGlyph) * 0x100);
+#endif
+
       err = atsu_get_text_layout_with_text_ptr (&c, 1,
                                                 font->mac_style,
                                                 &text_layout);
@@ -7414,8 +7513,19 @@ XLoadQueryFont (Display *dpy, char *fontname)
           return NULL;
         }
 
-      for (c = 0x20; c <= 0x7e; c++)
+      for (c = 0x20; c <= 0xff; c++)
         {
+          if (c == 0xad)
+            /* Soft hyphen is not supported in ATSUI.  */
+            continue;
+          else if (c == 0x7f)
+            {
+              STORE_XCHARSTRUCT (font->min_bounds, min_width, min_bounds);
+              STORE_XCHARSTRUCT (font->max_bounds, max_width, max_bounds);
+              c = 0x9f;
+              continue;
+            }
+
           err = ATSUClearLayoutCache (text_layout, kATSUFromTextBeginning);
           if (err == noErr)
             err = ATSUMeasureTextImage (text_layout,
@@ -7464,9 +7574,32 @@ XLoadQueryFont (Display *dpy, char *fontname)
                     }
                 }
             }
+#if USE_CG_TEXT_DRAWING
+          if (err == noErr && char_width > 0 && font->cg_font)
+            {
+              ATSUGlyphInfoArray glyph_info_array;
+              ByteCount count = sizeof (ATSUGlyphInfoArray);
+
+              err = ATSUMatchFontsToText (text_layout, kATSUFromTextBeginning,
+                                          kATSUToTextEnd, NULL, NULL, NULL);
+              if (err == noErr)
+                err = ATSUGetGlyphInfo (text_layout, kATSUFromTextBeginning,
+                                        kATSUToTextEnd, &count,
+                                        &glyph_info_array);
+              if (err == noErr)
+                font->cg_glyphs[c] = glyph_info_array.glyphs[0].glyphID;
+              else
+                {
+                  /* Don't use CG text drawing if font substitution
+                     occurs in ASCII or Latin-1 characters.  */
+                  CGFontRelease (font->cg_font);
+                  font->cg_font = NULL;
+                  xfree (font->cg_glyphs);
+                  font->cg_glyphs = NULL;
+                }
+            }
+#endif
         }
-      STORE_XCHARSTRUCT (font->min_bounds, min_width, min_bounds);
-      STORE_XCHARSTRUCT (font->max_bounds, max_width, max_bounds);
 
       font->min_byte1 = 0;
       font->max_byte1 = 0xff;
@@ -7579,6 +7712,13 @@ XLoadQueryFont (Display *dpy, char *fontname)
           SetRect (&max_bounds, 0, 0, 0, 0);
           for (c = 0x20; c <= 0xff; c++)
             {
+              if (c == 0x7f)
+                {
+                  STORE_XCHARSTRUCT (font->min_bounds, min_width, min_bounds);
+                  STORE_XCHARSTRUCT (font->max_bounds, max_width, max_bounds);
+                  continue;
+                }
+
               ch = c;
               char_width = CharWidth (ch);
               QDTextBounds (1, &ch, &char_bounds);
@@ -7601,8 +7741,6 @@ XLoadQueryFont (Display *dpy, char *fontname)
                   UnionRect (&max_bounds, &char_bounds, &max_bounds);
                 }
             }
-          STORE_XCHARSTRUCT (font->min_bounds, min_width, min_bounds);
-          STORE_XCHARSTRUCT (font->max_bounds, max_width, max_bounds);
           if (min_width == max_width
               && max_bounds.left >= 0 && max_bounds.right <= max_width)
             {
@@ -7618,6 +7756,15 @@ XLoadQueryFont (Display *dpy, char *fontname)
       TextFace (old_fontface);
     }
 
+#if !defined (MAC_OS8) || USE_ATSUI
+  /* AppKit and WebKit do some adjustment to the heights of Courier,
+     Helvetica, and Times.  This only works on the environments where
+     the XDrawImageString counterpart is never used.  */
+  if (strcmp (family, "courier") == 0 || strcmp (family, "helvetica") == 0
+      || strcmp (family, "times") == 0)
+    font->ascent += (font->ascent + font->descent) * .15 + 0.5;
+#endif
+
   return font;
 }
 
@@ -7633,6 +7780,12 @@ mac_unload_font (dpyinfo, font)
 #if USE_ATSUI
   if (font->mac_style)
     ATSUDisposeStyle (font->mac_style);
+#if USE_CG_TEXT_DRAWING
+  if (font->cg_font)
+    CGFontRelease (font->cg_font);
+  if (font->cg_glyphs)
+    xfree (font->cg_glyphs);
+#endif
 #endif
   xfree (font);
 }
@@ -7920,14 +8073,18 @@ x_find_ccl_program (fontp)
 /* Contains the string "reverse", which is a constant for mouse button emu.*/
 Lisp_Object Qreverse;
 
-/* True if using command key as meta key.  */
-Lisp_Object Vmac_command_key_is_meta;
 
-/* Modifier associated with the option key, or nil for normal behavior. */
+/* Modifier associated with the control key, or nil to ignore. */
+Lisp_Object Vmac_control_modifier;
+
+/* Modifier associated with the option key, or nil to ignore. */
 Lisp_Object Vmac_option_modifier;
 
-/* True if the ctrl and meta keys should be reversed.  */
-Lisp_Object Vmac_reverse_ctrl_meta;
+/* Modifier associated with the command key, or nil to ignore. */
+Lisp_Object Vmac_command_modifier;
+
+/* Modifier associated with the function key, or nil to ignore. */
+Lisp_Object Vmac_function_modifier;
 
 /* True if the option and command modifiers should be used to emulate
    a three button mouse */
@@ -8001,19 +8158,43 @@ mac_to_emacs_modifiers (EventModifiers mods)
 #endif
 {
   unsigned int result = 0;
-  if (mods & macShiftKey)
+  if (mods & shiftKey)
     result |= shift_modifier;
-  if (mods & macCtrlKey)
-    result |= ctrl_modifier;
-  if (mods & macMetaKey)
-    result |= meta_modifier;
-  if (NILP (Vmac_command_key_is_meta) && (mods & macAltKey))
-    result |= alt_modifier;
+
+
+
+  /* Deactivated to simplify configuration:
+     if Vmac_option_modifier is non-NIL, we fully process the Option
+     key. Otherwise, we only process it if an additional Ctrl or Command
+     is pressed. That way the system may convert the character to a
+     composed one.
+     if ((mods & optionKey) &&
+      (( !NILP(Vmac_option_modifier) ||
+      ((mods & cmdKey) || (mods & controlKey))))) */
+
   if (!NILP (Vmac_option_modifier) && (mods & optionKey)) {
-      Lisp_Object val = Fget(Vmac_option_modifier, Qmodifier_value);
-      if (!NILP(val))
-          result |= XUINT(val);
+    Lisp_Object val = Fget(Vmac_option_modifier, Qmodifier_value);
+    if (INTEGERP(val))
+      result |= XUINT(val);
   }
+  if (!NILP (Vmac_command_modifier) && (mods & cmdKey)) {
+    Lisp_Object val = Fget(Vmac_command_modifier, Qmodifier_value);
+    if (INTEGERP(val))
+      result |= XUINT(val);
+  }
+  if (!NILP (Vmac_control_modifier) && (mods & controlKey)) {
+    Lisp_Object val = Fget(Vmac_control_modifier, Qmodifier_value);
+    if (INTEGERP(val))
+      result |= XUINT(val);
+  }
+
+#ifdef MAC_OSX
+  if (!NILP (Vmac_function_modifier) && (mods & kEventKeyModifierFnMask)) {
+    Lisp_Object val = Fget(Vmac_function_modifier, Qmodifier_value);
+    if (INTEGERP(val))
+      result |= XUINT(val);
+  }
+#endif
 
   return result;
 }
@@ -8035,7 +8216,7 @@ mac_get_emulated_btn ( UInt32 modifiers )
 #if USE_CARBON_EVENTS
 /* Obtains the event modifiers from the event ref and then calls
    mac_to_emacs_modifiers.  */
-static int
+static UInt32
 mac_event_to_emacs_modifiers (EventRef eventRef)
 {
   UInt32 mods = 0;
@@ -9385,6 +9566,7 @@ static unsigned char keycode_to_xkeysym_table[] = {
   /*0x7C*/ 0x53 /*right*/, 0x54 /*down*/, 0x52 /*up*/, 0
 };
 
+
 static int
 keycode_to_xkeysym (int keyCode, int *xKeySym)
 {
@@ -9392,6 +9574,121 @@ keycode_to_xkeysym (int keyCode, int *xKeySym)
   return *xKeySym != 0;
 }
 
+static unsigned char fn_keycode_to_xkeysym_table[] = {
+  /*0x00*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  /*0x10*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  /*0x20*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+  /*0x30*/ 0, 0, 0, 0,
+  /*0x34*/ 0, 0, 0, 0,
+  /*0x38*/ 0, 0, 0, 0,
+  /*0x3C*/ 0, 0, 0, 0,
+
+  /*0x40*/ 0, 0x2e /*kp-. = .*/, 0, 0x50 /*kp-* = 'p'*/,
+  /*0x44*/ 0, '/' /*kp-+*/, 0, 0,
+  /*0x48*/ 0, 0, 0, 0x30 /*kp-/ = '0'*/,
+  /*0x4C*/ 0, 0, 0x3b /*kp-- = ';'*/, 0,
+
+  /*0x50*/ 0, 0x2d /*kp-= = '-'*/, 0x6d /*kp-0 = 'm'*/, 0x6a /*kp-1 = 'j'*/,
+  /*0x54*/ 0x6b /*kp-2 = 'k'*/, 0x6c /*kp-3 = 'l'*/, 'u' /*kp-4*/, 'i' /*kp-5*/,
+  /*0x58*/ 'o' /*kp-6*/, '7' /*kp-7*/, 0, '8' /*kp-8*/,
+  /*0x5C*/ '9' /*kp-9*/, 0, 0, 0,
+
+  /*0x60*/ 0, 0, 0, 0,
+  /*0x64*/ 0, 0, 0, 0,
+  /*0x68*/ 0, 0, 0, 0,
+  /*0x6C*/ 0, 0, 0, 0,
+
+  /*0x70*/ 0, 0, 0, 0,
+  /*0x74*/ 0, 0, 0, 0,
+  /*0x78*/ 0, 0, 0, 0,
+  /*0x7C*/ 0, 0, 0, 0
+};
+static int
+convert_fn_keycode (EventRef eventRef, int keyCode, int *newCode)
+{
+#ifdef MAC_OSX
+  /* Use the special map to translate keys when function modifier is
+     to be caught. KeyTranslate can't be used in that case.
+     We can't detect the function key using the input_event.modifiers,
+     because this uses the high word of an UInt32. Therefore,
+     we'll just read it out of the original eventRef.
+  */
+
+
+  /* TODO / known issues
+
+  - Fn-Shift-j is regonized as Fn-j and not Fn-J.
+  The above table always translates to lower characters. We need to use
+  the KCHR keyboard resource (KeyTranslate() ) to map k->K and 8->*.
+
+  - The table is meant for English language keyboards, and it will work
+  for many others with the exception of key combinations like Fn-ö on
+  a German keyboard, which is currently mapped to Fn-;.
+  How to solve this without keeping separate tables for all keyboards
+  around? KeyTranslate isn't of much help here, as it only takes a 16-bit
+  value for keycode with the modifiers in he high byte, i.e. no room for the
+  Fn modifier. That's why we need the table.
+
+  */
+
+  UInt32 mods = 0;
+  if (!NILP(Vmac_function_modifier))
+    {
+      GetEventParameter (eventRef, kEventParamKeyModifiers, typeUInt32, NULL,
+                         sizeof (UInt32), NULL, &mods);
+      if (mods & kEventKeyModifierFnMask)
+        {  *newCode = fn_keycode_to_xkeysym_table [keyCode & 0x7f];
+
+          return (*newCode != 0);
+        }
+    }
+#endif
+  return false;
+}
+
+static int
+backtranslate_modified_keycode(int mods, int keycode, int def)
+{
+  if  (mods &
+       (controlKey |
+        (NILP (Vmac_option_modifier) ? 0 : optionKey) |
+        cmdKey))
+    {
+      /* This code comes from Keyboard Resource,
+         Appendix C of IM - Text.  This is necessary
+         since shift is ignored in KCHR table
+         translation when option or command is pressed.
+         It also does not translate correctly
+         control-shift chars like C-% so mask off shift
+         here also.
+
+         Not done for combinations with the option key (alt)
+         unless it is to be caught by Emacs:  this is
+         to preserve key combinations translated by the OS
+         such as Alt-3.
+      */
+      /* mask off option and command */
+      int new_modifiers = mods & 0xe600;
+      /* set high byte of keycode to modifier high byte*/
+      int new_keycode = keycode | new_modifiers;
+      Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache);
+      unsigned long some_state = 0;
+      return (int) KeyTranslate (kchr_ptr, new_keycode,
+                           &some_state) & 0xff;
+      /* TO DO: Recognize two separate resulting characters, "for
+         example, when the user presses Option-E followed by N, you
+         can map this through the KeyTranslate function using the
+         U.S. 'KCHR' resource to produce ´n, which KeyTranslate
+         returns as two characters in the bytes labeled Character code
+         1 and Character code 2." (from Carbon API doc) */
+
+    }
+  else
+    return def;
+}
+
+
 #if !USE_CARBON_EVENTS
 static RgnHandle mouse_region = NULL;
 
@@ -9936,8 +10233,7 @@ XTread_socket (sd, expected, hold_quit)
                  || !(er.modifiers & cmdKey))
                 && (!NILP (Vmac_pass_control_to_system)
                     || !(er.modifiers & controlKey))
-                && (!NILP (Vmac_command_key_is_meta)
-                    && NILP (Vmac_option_modifier)
+                && (NILP (Vmac_option_modifier)
                     || !(er.modifiers & optionKey)))
               if (SendEventToEventTarget (eventRef, toolbox_dispatcher)
                   != eventNotHandledErr)
@@ -9981,49 +10277,36 @@ XTread_socket (sd, expected, hold_quit)
                 dpyinfo->mouse_face_hidden = 1;
               }
 
-            if (keycode_to_xkeysym (keycode, &xkeysym))
-              {
-                inev.code = 0xff00 | xkeysym;
-                inev.kind = NON_ASCII_KEYSTROKE_EVENT;
-              }
-            else
+            /* translate the keycode back to determine the original key */
+            /* Convert key code if function key is pressed.
+               Otherwise, if non-ASCII-event, take care of that
+               without re-translating the key code. */
+#if USE_CARBON_EVENTS
+            if (convert_fn_keycode (eventRef, keycode, &xkeysym))
               {
-                if (er.modifiers & (controlKey |
-                                    (NILP (Vmac_command_key_is_meta) ? optionKey
-                                     : cmdKey)))
-                  {
-                    /* This code comes from Keyboard Resource,
-                       Appendix C of IM - Text.  This is necessary
-                       since shift is ignored in KCHR table
-                       translation when option or command is pressed.
-                       It also does not translate correctly
-                       control-shift chars like C-% so mask off shift
-                       here also */
-                    int new_modifiers = er.modifiers & 0xe600;
-                    /* mask off option and command */
-                    int new_keycode = keycode | new_modifiers;
-                    Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache);
-                    unsigned long some_state = 0;
-                    inev.code = KeyTranslate (kchr_ptr, new_keycode,
-                                              &some_state) & 0xff;
-                  }
-                else if (!NILP (Vmac_option_modifier)
-                         && (er.modifiers & optionKey))
-                  {
-                    /* When using the option key as an emacs modifier,
-                       convert the pressed key code back to one
-                       without the Mac option modifier applied. */
-                    int new_modifiers = er.modifiers & ~optionKey;
-                    int new_keycode = keycode | new_modifiers;
-                    Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache);
-                    unsigned long some_state = 0;
-                    inev.code = KeyTranslate (kchr_ptr, new_keycode,
-                                              &some_state) & 0xff;
-                  }
-                else
-                  inev.code = er.message & charCodeMask;
+                inev.code = xkeysym;
+                /* this doesn't work - tried to add shift modifiers */
+                  inev.code =
+                    backtranslate_modified_keycode(er.modifiers & (~0x2200),
+                                                   xkeysym | 0x80,  xkeysym);
                 inev.kind = ASCII_KEYSTROKE_EVENT;
               }
+            else
+#endif
+              if (keycode_to_xkeysym (keycode, &xkeysym))
+                {
+                  inev.code = 0xff00 | xkeysym;
+                  inev.kind = NON_ASCII_KEYSTROKE_EVENT;
+                }
+              else
+                {
+
+                  inev.code =
+                    backtranslate_modified_keycode(er.modifiers, keycode,
+                                                   er.message & charCodeMask);
+                  inev.kind = ASCII_KEYSTROKE_EVENT;
+
+                }
           }
 
 #if USE_CARBON_EVENTS
@@ -10463,10 +10746,9 @@ mac_determine_quit_char_modifiers()
 
   /* Map modifiers */
   mac_quit_char_modifiers = 0;
-  if (qc_modifiers & ctrl_modifier)  mac_quit_char_modifiers |= macCtrlKey;
-  if (qc_modifiers & shift_modifier) mac_quit_char_modifiers |= macShiftKey;
-  if (qc_modifiers & meta_modifier)  mac_quit_char_modifiers |= macMetaKey;
-  if (qc_modifiers & alt_modifier)   mac_quit_char_modifiers |= macAltKey;
+  if (qc_modifiers & ctrl_modifier)  mac_quit_char_modifiers |= controlKey;
+  if (qc_modifiers & shift_modifier) mac_quit_char_modifiers |= shiftKey;
+  if (qc_modifiers & alt_modifier)   mac_quit_char_modifiers |= optionKey;
 }
 
 static void
@@ -10624,6 +10906,10 @@ syms_of_macterm ()
 #endif
 
   Qmodifier_value = intern ("modifier-value");
+  Qctrl = intern ("ctrl");
+  Fput (Qctrl, Qmodifier_value, make_number (ctrl_modifier));
+  Qmeta = intern ("meta");
+  Fput (Qmeta, Qmodifier_value, make_number (meta_modifier));
   Qalt = intern ("alt");
   Fput (Qalt, Qmodifier_value, make_number (alt_modifier));
   Qhyper = intern ("hyper");
@@ -10676,21 +10962,36 @@ syms_of_macterm ()
   staticpro (&last_mouse_motion_frame);
   last_mouse_motion_frame = Qnil;
 
-  DEFVAR_LISP ("mac-command-key-is-meta", &Vmac_command_key_is_meta,
-    doc: /* Non-nil means that the command key is used as the Emacs meta key.
-Otherwise the option key is used.  */);
-  Vmac_command_key_is_meta = Qt;
+
+
+/* Variables to configure modifier key assignment.  */
+
+  DEFVAR_LISP ("mac-control-modifier", &Vmac_control_modifier,
+    doc: /* Modifier key assumed when the Mac control key is pressed.
+The value can be `alt', `ctrl', `hyper', or `super' for the respective
+modifier.  The default is `ctrl'.  */);
+  Vmac_control_modifier = Qctrl;
 
   DEFVAR_LISP ("mac-option-modifier", &Vmac_option_modifier,
-    doc: /* Modifier to use for the Mac alt/option key.  The value can
-be alt, hyper, or super for the respective modifier.  If the value is
-nil then the key will act as the normal Mac option modifier.  */);
+    doc: /* Modifier key assumed when the Mac alt/option key is pressed.
+The value can be `alt', `ctrl', `hyper', or `super' for the respective
+modifier.  If the value is nil then the key will act as the normal
+Mac control modifier, and the option key can be used to compose
+characters depending on the chosen Mac keyboard setting. */);
   Vmac_option_modifier = Qnil;
 
-  DEFVAR_LISP ("mac-reverse-ctrl-meta", &Vmac_reverse_ctrl_meta,
-    doc: /* Non-nil means that the control and meta keys are reversed.  This is
-useful for non-standard keyboard layouts.  */);
-  Vmac_reverse_ctrl_meta = Qnil;
+  DEFVAR_LISP ("mac-command-modifier", &Vmac_command_modifier,
+    doc: /* Modifier key assumed when the Mac command key is pressed.
+The value can be `alt', `ctrl', `hyper', or `super' for the respective
+modifier. The default is `meta'. */);
+  Vmac_command_modifier = Qmeta;
+
+  DEFVAR_LISP ("mac-function-modifier", &Vmac_function_modifier,
+    doc: /* Modifier key assumed when the Mac function key is pressed.
+The value can be `alt', `ctrl', `hyper', or `super' for the respective
+modifier. Note that remapping the function key may lead to unexpected
+results for some keys on non-US/GB keyboards.  */);
+  Vmac_function_modifier = Qnil;
 
   DEFVAR_LISP ("mac-emulate-three-button-mouse",
                &Vmac_emulate_three_button_mouse,
diff --git a/src/print.c b/src/print.c
index 91642afd651..d563580ddd3 100644
--- a/src/print.c
+++ b/src/print.c
@@ -970,6 +970,26 @@ debug_print (arg)
   Fprin1 (arg, Qexternal_debugging_output);
   fprintf (stderr, "\r\n");
 }
+
+void
+safe_debug_print (arg)
+     Lisp_Object arg;
+{
+  int valid = valid_lisp_object_p (arg);
+
+  if (valid > 0)
+    debug_print (arg);
+  else
+    fprintf (stderr, "#<%s_LISP_OBJECT 0x%08lx>\r\n",
+             !valid ? "INVALID" : "SOME",
+#ifdef NO_UNION_TYPE
+             (unsigned long) arg
+#else
+             (unsigned long) arg.i
+#endif
+             );
+}
+
 
 DEFUN ("error-message-string", Ferror_message_string, Serror_message_string,
        1, 1, 0,
diff --git a/src/process.c b/src/process.c
index dd892637726..752768a7bad 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5944,97 +5944,100 @@ SIGCODE may be an integer, or a symbol whose name is a signal name.  */)
       CHECK_SYMBOL (sigcode);
       name = SDATA (SYMBOL_NAME (sigcode));
 
+      if (!strncmp(name, "SIG", 3))
+        name += 3;
+
       if (0)
         ;
 #ifdef SIGHUP
-      handle_signal ("SIGHUP", SIGHUP);
+      handle_signal ("HUP", SIGHUP);
 #endif
 #ifdef SIGINT
-      handle_signal ("SIGINT", SIGINT);
+      handle_signal ("INT", SIGINT);
 #endif
 #ifdef SIGQUIT
-      handle_signal ("SIGQUIT", SIGQUIT);
+      handle_signal ("QUIT", SIGQUIT);
 #endif
 #ifdef SIGILL
-      handle_signal ("SIGILL", SIGILL);
+      handle_signal ("ILL", SIGILL);
 #endif
 #ifdef SIGABRT
-      handle_signal ("SIGABRT", SIGABRT);
+      handle_signal ("ABRT", SIGABRT);
 #endif
 #ifdef SIGEMT
-      handle_signal ("SIGEMT", SIGEMT);
+      handle_signal ("EMT", SIGEMT);
 #endif
 #ifdef SIGKILL
-      handle_signal ("SIGKILL", SIGKILL);
+      handle_signal ("KILL", SIGKILL);
 #endif
 #ifdef SIGFPE
-      handle_signal ("SIGFPE", SIGFPE);
+      handle_signal ("FPE", SIGFPE);
 #endif
 #ifdef SIGBUS
-      handle_signal ("SIGBUS", SIGBUS);
+      handle_signal ("BUS", SIGBUS);
 #endif
 #ifdef SIGSEGV
-      handle_signal ("SIGSEGV", SIGSEGV);
+      handle_signal ("SEGV", SIGSEGV);
 #endif
 #ifdef SIGSYS
-      handle_signal ("SIGSYS", SIGSYS);
+      handle_signal ("SYS", SIGSYS);
 #endif
 #ifdef SIGPIPE
-      handle_signal ("SIGPIPE", SIGPIPE);
+      handle_signal ("PIPE", SIGPIPE);
 #endif
 #ifdef SIGALRM
-      handle_signal ("SIGALRM", SIGALRM);
+      handle_signal ("ALRM", SIGALRM);
 #endif
 #ifdef SIGTERM
-      handle_signal ("SIGTERM", SIGTERM);
+      handle_signal ("TERM", SIGTERM);
 #endif
 #ifdef SIGURG
-      handle_signal ("SIGURG", SIGURG);
+      handle_signal ("URG", SIGURG);
 #endif
 #ifdef SIGSTOP
-      handle_signal ("SIGSTOP", SIGSTOP);
+      handle_signal ("STOP", SIGSTOP);
 #endif
 #ifdef SIGTSTP
-      handle_signal ("SIGTSTP", SIGTSTP);
+      handle_signal ("TSTP", SIGTSTP);
 #endif
 #ifdef SIGCONT
-      handle_signal ("SIGCONT", SIGCONT);
+      handle_signal ("CONT", SIGCONT);
 #endif
 #ifdef SIGCHLD
-      handle_signal ("SIGCHLD", SIGCHLD);
+      handle_signal ("CHLD", SIGCHLD);
 #endif
 #ifdef SIGTTIN
-      handle_signal ("SIGTTIN", SIGTTIN);
+      handle_signal ("TTIN", SIGTTIN);
 #endif
 #ifdef SIGTTOU
-      handle_signal ("SIGTTOU", SIGTTOU);
+      handle_signal ("TTOU", SIGTTOU);
 #endif
 #ifdef SIGIO
-      handle_signal ("SIGIO", SIGIO);
+      handle_signal ("IO", SIGIO);
 #endif
 #ifdef SIGXCPU
-      handle_signal ("SIGXCPU", SIGXCPU);
+      handle_signal ("XCPU", SIGXCPU);
 #endif
 #ifdef SIGXFSZ
-      handle_signal ("SIGXFSZ", SIGXFSZ);
+      handle_signal ("XFSZ", SIGXFSZ);
 #endif
 #ifdef SIGVTALRM
-      handle_signal ("SIGVTALRM", SIGVTALRM);
+      handle_signal ("VTALRM", SIGVTALRM);
 #endif
 #ifdef SIGPROF
-      handle_signal ("SIGPROF", SIGPROF);
+      handle_signal ("PROF", SIGPROF);
 #endif
 #ifdef SIGWINCH
-      handle_signal ("SIGWINCH", SIGWINCH);
+      handle_signal ("WINCH", SIGWINCH);
 #endif
 #ifdef SIGINFO
-      handle_signal ("SIGINFO", SIGINFO);
+      handle_signal ("INFO", SIGINFO);
 #endif
 #ifdef SIGUSR1
-      handle_signal ("SIGUSR1", SIGUSR1);
+      handle_signal ("USR1", SIGUSR1);
 #endif
 #ifdef SIGUSR2
-      handle_signal ("SIGUSR2", SIGUSR2);
+      handle_signal ("USR2", SIGUSR2);
 #endif
       else
         error ("Undefined signal name %s", name);
diff --git a/src/s/darwin.h b/src/s/darwin.h
index fad445d7557..6227010e3ed 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -263,13 +263,13 @@ Boston, MA 02110-1301, USA.  */
 
 /* Indicate that we are compiling for Mac OS X and where to find Mac
    specific headers.  */
-#define C_SWITCH_SYSTEM -fpascal-strings -fno-common -DMAC_OSX -I../mac/src
+#define C_SWITCH_SYSTEM -fpascal-strings -DMAC_OSX -I../mac/src
 
 /* Link in the Carbon lib. */
 #ifdef HAVE_CARBON
 #define LIBS_CARBON -framework Carbon -framework QuickTime
 #else
-#define LIBS_CARBON -framework Carbon
+#define LIBS_CARBON
 #endif
 
 /* The -headerpad option tells ld (see man page) to leave room at the
@@ -328,6 +328,10 @@ struct kboard;
    does not exist.  */
 #undef HAVE_WORKING_VFORK
 #define vfork fork
+
+/* Don't close pty in process.c to make it as controlling terminal.
+   It is already a controlling terminal of subprocess, because we did
+   ioctl TIOCSCTTY.  */
 #define DONT_REOPEN_PTY
 
 #ifdef temacs
diff --git a/src/search.c b/src/search.c
index d3a5bd838a9..ab4b2a0f519 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1174,7 +1174,7 @@ search_buffer (string, pos, pos_byte, lim, lim_byte, n,
       int raw_pattern_size_byte;
       unsigned char *patbuf;
       int multibyte = !NILP (current_buffer->enable_multibyte_characters);
-      unsigned char *base_pat = SDATA (string);
+      unsigned char *base_pat;
       /* Set to positive if we find a non-ASCII char that need
          translation.  Otherwise set to zero later.  */
       int charset_base = -1;
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 9db9622f6f5..43e1f5e805c 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -174,7 +174,7 @@ off_t data_segment_old_fileoff;
 
 struct segment_command *data_segment_scp;
 
-/* Read n bytes from infd into memory starting at address dest.
+/* Read N bytes from infd into memory starting at address DEST.
    Return true if successful, false otherwise.  */
 static int
 unexec_read (void *dest, size_t n)
@@ -182,8 +182,9 @@ unexec_read (void *dest, size_t n)
   return n == read (infd, dest, n);
 }
 
-/* Write n bytes from memory starting at address src to outfd starting
-   at offset dest.  Return true if successful, false otherwise.  */
+/* Write COUNT bytes from memory starting at address SRC to outfd
+   starting at offset DEST.  Return true if successful, false
+   otherwise.  */
 static int
 unexec_write (off_t dest, const void *src, size_t count)
 {
@@ -193,8 +194,32 @@ unexec_write (off_t dest, const void *src, size_t count)
   return write (outfd, src, count) == count;
 }
 
-/* Copy n bytes from starting offset src in infd to starting offset
-   dest in outfd.  Return true if successful, false otherwise.  */
+/* Write COUNT bytes of zeros to outfd starting at offset DEST.
+   Return true if successful, false otherwise.  */
+static int
+unexec_write_zero (off_t dest, size_t count)
+{
+  char buf[UNEXEC_COPY_BUFSZ];
+  ssize_t bytes;
+
+  bzero (buf, UNEXEC_COPY_BUFSZ);
+  if (lseek (outfd, dest, SEEK_SET) != dest)
+    return 0;
+
+  while (count > 0)
+    {
+      bytes = count > UNEXEC_COPY_BUFSZ ? UNEXEC_COPY_BUFSZ : count;
+      if (write (outfd, buf, bytes) != bytes)
+        return 0;
+      count -= bytes;
+    }
+
+  return 1;
+}
+
+/* Copy COUNT bytes from starting offset SRC in infd to starting
+   offset DEST in outfd.  Return true if successful, false
+   otherwise.  */
 static int
 unexec_copy (off_t dest, off_t src, ssize_t count)
 {
@@ -684,14 +709,39 @@ copy_data_segment (struct load_command *lc)
           if (!unexec_write (header_offset, sectp, sizeof (struct section)))
             unexec_error ("cannot write section %s's header", SECT_DATA);
         }
-      else if (strncmp (sectp->sectname, SECT_BSS, 16) == 0
-               || strncmp (sectp->sectname, SECT_COMMON, 16) == 0)
+      else if (strncmp (sectp->sectname, SECT_COMMON, 16) == 0)
         {
           sectp->flags = S_REGULAR;
           if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size))
-            unexec_error ("cannot write section %s", SECT_DATA);
+            unexec_error ("cannot write section %s", sectp->sectname);
           if (!unexec_write (header_offset, sectp, sizeof (struct section)))
-            unexec_error ("cannot write section %s's header", SECT_DATA);
+            unexec_error ("cannot write section %s's header", sectp->sectname);
+        }
+      else if (strncmp (sectp->sectname, SECT_BSS, 16) == 0)
+        {
+          extern char *my_endbss_static;
+          unsigned long my_size;
+
+          sectp->flags = S_REGULAR;
+
+          /* Clear uninitialized local variables in statically linked
+             libraries.  In particular, function pointers stored by
+             libSystemStub.a, which is introduced in Mac OS X 10.4 for
+             binary compatibility with respect to long double, are
+             cleared so that they will be reinitialized when the
+             dumped binary is executed on other versions of OS.  */
+          my_size = (unsigned long)my_endbss_static - sectp->addr;
+          if (!(sectp->addr <= (unsigned long)my_endbss_static
+                && my_size <= sectp->size))
+            unexec_error ("my_endbss_static is not in section %s",
+                          sectp->sectname);
+          if (!unexec_write (sectp->offset, (void *) sectp->addr, my_size))
+            unexec_error ("cannot write section %s", sectp->sectname);
+          if (!unexec_write_zero (sectp->offset + my_size,
+                                  sectp->size - my_size))
+            unexec_error ("cannot write section %s", sectp->sectname);
+          if (!unexec_write (header_offset, sectp, sizeof (struct section)))
+            unexec_error ("cannot write section %s's header", sectp->sectname);
         }
       else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
                || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
diff --git a/src/xdisp.c b/src/xdisp.c
index 4db562c2283..623a1b3a524 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2965,11 +2965,13 @@ handle_stop (it)
      struct it *it;
 {
   enum prop_handled handled;
-  int handle_overlay_change_p = 1;
+  int handle_overlay_change_p;
   struct props *p;
 
   it->dpvec = NULL;
   it->current.dpvec_index = -1;
+  handle_overlay_change_p = !it->ignore_overlay_strings_at_pos_p;
+  it->ignore_overlay_strings_at_pos_p = 0;
 
   /* Use face of preceding text for ellipsis (if invisible) */
   if (it->selective_display_ellipsis_p)
@@ -5673,6 +5675,9 @@ set_iterator_to_next (it, reseat_p)
             reseat_at_next_visible_line_start (it, 1);
           else if (it->dpvec_char_len > 0)
             {
+              if (it->method == GET_FROM_STRING
+                  && it->n_overlay_strings > 0)
+                it->ignore_overlay_strings_at_pos_p = 1;
               it->len = it->dpvec_char_len;
               set_iterator_to_next (it, reseat_p);
             }
@@ -20809,7 +20814,7 @@ get_window_cursor_type (w, glyph, width, active_cursor)
   /* Use cursor-in-non-selected-windows for non-selected window or frame.  */
   if (non_selected)
     {
-      alt_cursor = XBUFFER (w->buffer)->cursor_in_non_selected_windows;
+      alt_cursor = b->cursor_in_non_selected_windows;
       return get_specified_cursor_type (alt_cursor, width);
     }
 
diff --git a/src/xfns.c b/src/xfns.c
index d39616429ad..311bc5f1bd8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -829,6 +829,27 @@ xg_set_icon (f, file)
   UNGCPRO;
   return result;
 }
+
+int
+xg_set_icon_from_xpm_data (f, data)
+    FRAME_PTR f;
+    char **data;
+{
+  int result = 0;
+  GError *err = NULL;
+  GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (data);
+
+  if (!pixbuf)
+    {
+      g_error_free (err);
+      return 0;
+    }
+
+  gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+                       pixbuf);
+  g_object_unref (pixbuf);
+  return 1;
+}
 #endif /* USE_GTK */
 
 
diff --git a/src/xterm.c b/src/xterm.c
index 1adcb4fb4d1..42c860b64c9 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7376,10 +7376,30 @@ x_bitmap_icon (f, file)
       /* Create the GNU bitmap and mask if necessary.  */
       if (FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id < 0)
         {
-          FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id
-            = x_create_bitmap_from_data (f, gnu_bits,
-                                         gnu_width, gnu_height);
-          x_create_bitmap_mask (f, FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id);
+          int rc = -1;
+
+#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
+#ifdef USE_GTK
+          if (xg_set_icon_from_xpm_data (f, gnu_xpm_bits))
+            return 0;
+#else
+          rc = x_create_bitmap_from_xpm_data (f, gnu_xpm_bits);
+          if (rc != -1)
+            FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id = rc;
+#endif /* USE_GTK */
+#endif /* defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) */
+
+          /* If all else fails, use the (black and white) xbm image. */
+          if (rc == -1)
+            {
+              rc = x_create_bitmap_from_data (f, gnu_xbm_bits,
+                                              gnu_xbm_width, gnu_xbm_height);
+              if (rc == -1)
+                return 1;
+
+              FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id = rc;
+              x_create_bitmap_mask (f, FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id);
+            }
         }
 
       /* The first time we create the GNU bitmap and mask,