Merged from miles@gnu.org--gnu-2005 (patch 60-65, 246-265)

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-64
   (mm-string-to-multibyte): Use Gnus trunk definition.

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

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

12 files changed, 508 insertions, 314 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 26b8a9ce5ad..3483a2c5905 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,102 @@
+2005-04-16  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term.c (struct keys): Add support for shifted keys.
+
+2005-04-16  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (with_echo_area_buffer): Delete WHICH < 0 case.
+        (set_message): Call with_echo_area_buffer with WHICH = 0.
+        (set_message_1): Erase the echo area buffer first thing.
+        (echo_area_display): Don't clear echo_message_buffer.
+
+2005-04-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * Makefile.in (mac.o): Depend on charset.h and coding.h.
+
+        * mac.c: Include charset.h and coding.h.
+        [TARGET_API_MAC_CARBON] (Qutf_8): Remove extern.
+        [TARGET_API_MAC_CARBON] (cfstring_create_with_string): New
+        function.
+        [TARGET_API_MAC_CARBON] (Fmac_get_preference): Use it.
+
+        * macfns.c [TARGET_API_MAC_CARBON] (Fx_file_dialog): Likewise.
+
+        * image.c [MAC_OSX] (image_load_quartz2d): Likewise.
+
+        * macterm.c (x_autoselect_window_p): Remove variable.
+        (last_window): New variable.
+        (XTreassert_line_highlight, x_change_line_highlight): Remove
+        declarations.
+        (mac_focus_changed, x_detect_focus_change): New functions and
+        declarations.
+        (XTextExtents16, front_emacs_window): Remove function.
+        (mac_focus_frame): New function.
+        (XTmouse_position, do_menu_choice, do_zoom_window, XTread_socket)
+        (mac_check_for_quit_char): Use it instead of front_emacs_window.
+        (x_scroll_bar_report_motion): Obtain window from control owner.
+        (x_make_frame_invisible): Set window manager size hint.
+        (do_mouse_moved): Remove function.
+        (XTread_socket): Move its contents here.  Generate select-window
+        event on mouse movement if needed.  Use x_detect_focus_change on
+        activate/deactivate events.  Don't deiconify frame or invalidate
+        window rectangle when dnd items are dropped.  Don't
+        activate/deactivate root control.
+        (frame_highlight, frame_unhighlight): Activate/deactivate root
+        control here.
+        (syms_of_macterm): Delete DEFVAR_BOOL for x_autoselect_window_p.
+
+        * macterm.h (cfstring_create_with_string) [TARGET_API_MAC_CARBON]:
+        New extern.
+
+2005-04-15  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * Makefile.in: Define new macro TOOLTIP_SUPPORT.
+        (lisp): Use it.
+        (SOME_MACHINE_LISP): Add tooltip.
+
+2005-04-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mac.c [!TARGET_API_MAC_CARBON]: Include MacLocales.h.  Don't
+        include TextEncodingConverter.h.
+        (mac_system_script_code, Vmac_system_locale): New variables.
+        (syms_of_mac): Defvar them.
+        (mac_get_system_locale): New function.
+
+        * macfns.c (x_set_name, x_set_title) [!TARGET_API_MAC_CARBON]: Use
+        ENCODE_SYSTEM to encode title bar string.
+        (x_create_tip_frame): Apply 2005-03-18 change for xfns.c.
+        (Fx_file_dialog) [TARGET_API_MAC_CARBON && !MAC_OSX]: Use
+        CFStringGetSystemEncoding to get system default string encoding.
+
+        * macterm.c [!TARGET_API_MAC_CARBON]: Don't include
+        TextEncodingConverter.h.
+
+2005-04-13  Steven Tamm  <steventamm@mac.com>
+
+        * macterm.c (syms_of_macterm): Remove redundant definition of
+        mac-pass-control-to-system.
+
+2005-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (Fset_window_configuration): Be careful when you choose
+        among several possible points for the new_current_buffer.
+
+2005-04-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * keyboard.c (poll_for_input) [SYNC_INPUT]: Don't call
+        poll_for_input_1.  Set interrupt_input_pending to 1 instead.
+        (Qlanguage_change) [MAC_OS]: New variable.
+        (syms_of_keyboard) [MAC_OS]: Intern and staticpro it.
+        (kbd_buffer_get_event) [MAC_OS]: Make event for LANGUAGE_CHANGE_EVENT.
+
+        * macterm.c (mac_keyboard_text_encoding)
+        (current_mac_keyboard_text_encoding): Remove variables.
+        (XTread_socket): Store language-change event if keyboard script change
+        is detected.  Don't convert input to `mac_keyboard_text_encoding'.
+        (syms_of_macterm): Delete DEFVAR_INT for mac-keyboard-text-encoding.
+
+        * termhooks.h (enum event_kind) [MAC_OS]: Add LANGUAGE_CHANGE_EVENT.
+
 2005-04-10  Richard M. Stallman  <rms@gnu.org>
 
         * emacs.c (standard_args): Rename --bare-bones to --quick.
@@ -48,8 +147,8 @@
         * mac.c (cfdate_to_lisp): Add `const' for variable `epoch_gdate'.
         (Fmac_get_preference): Doc fix.
 
-        * macfns.c (Fx_create_frame, x_create_tip_frame): Add
-        "fontset-mac" to fallback font/fontsets.
+        * macfns.c (Fx_create_frame, x_create_tip_frame):
+        Add "fontset-mac" to fallback font/fontsets.
 
 2005-04-04  Kim F. Storm  <storm@cua.dk>
 
@@ -80,8 +179,8 @@
         Vascii_downcase_table.
         (fast_string_match_ignore_case): Likewise.
         (search_buffer): Fix checking of boyer-moore usability.
-        (boyer_moore): Calculate translate_prev_byte1/2/3 in advance.  No
-        need of tranlating characters in PAT.  Fix calculation of
+        (boyer_moore): Calculate translate_prev_byte1/2/3 in advance.
+        No need of tranlating characters in PAT.  Fix calculation of
         simple_translate.
 
 2005-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -885,9 +984,9 @@
 
 2005-02-02  Steven Tamm  <steventamm@mac.com>
 
-        * macfns.c (unwind_create_frame): Fixing compile error due to
+        * macfns.c (unwind_create_frame): Fix compile error due to
         xassert being uncondition, but predicate is.
-        * dispnew.c (update_window): Fixing compile error due to
+        * dispnew.c (update_window): Fix compile error due to
         xassert being uncondition, but predicate is.
 
 2005-02-02  Miles Bader  <miles@gnu.org>
@@ -1031,6 +1130,7 @@
 
         * s/darwin.h: Removed PTY_ITERATION from here.
         (DARWIN): Define.
+
         * process.c (init_process): Default process-connection-type to
         nil on darwin 6 or less, t if it is 7 or higher.  This way the
         broken pty behavior is still allowed on darwin 6 for interactive
@@ -3536,8 +3636,8 @@
 2004-08-26  Steven Tamm  <steventamm@mac.com>
 
         * fileio.c (Fread_file_name): Call x_file_dialog on carbon on
-        tool-bar/menu click
-        * macfns.c (Fx_file_dialog): Implemented using NavServices
+        tool-bar/menu click.
+        * macfns.c (Fx_file_dialog): Implement using NavServices.
 
 2004-08-24  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
@@ -5024,7 +5124,7 @@
 
 2004-04-26  Steven Tamm  <tamm@Steven-Tamms-Computer.local>
 
-        * lread.c (init_lread): Fixing typo HAVE_CARBON test logic
+        * lread.c (init_lread): Fix typo in HAVE_CARBON test logic.
 
 2004-04-26  Miles Bader  <miles@gnu.org>
 
@@ -5479,10 +5579,10 @@
 
 2004-03-11  Steven Tamm <steventamm@mac.com>
 
-        * image.c [MAC_OSX]: Include sys/stat.h
+        * image.c [MAC_OSX]: Include sys/stat.h.
 
         * macfns.c (syms_of_macfns): Remove definitions of things now
-        defined in image.c
+        defined in image.c.
 
 2004-03-11  Kim F. Storm  <storm@cua.dk>
 
@@ -6192,7 +6292,7 @@
         * macterm.c (Vmac_emulate_three_button_mouse): New variable for
         controlling emulation of a three button mouse with option and
         command keys.
-        (Qreverse, mac_get_enumlated_btn): Handle the emulation
+        (Qreverse, mac_get_enumlated_btn): Handle the emulation.
         (mac_event_to_emacs_modifiers, XTread_socket): Ditto.
 
 2004-02-15  Kim F. Storm  <storm@cua.dk>
@@ -11132,7 +11232,7 @@
 
 2003-01-20  Steven Tamm  <steventamm@mac.com>
 
-        * macterm.c (XTread_socket): Checks for valid, visible window
+        * macterm.c (XTread_socket): Check for valid, visible window
         before sending a scroll-wheel event.
 
 2003-01-20  Richard M. Stallman  <rms@gnu.org>
@@ -11491,7 +11591,7 @@
 
 2002-12-28  Steven Tamm  <steventamm@mac.com>
 
-        * Makefile.in (macosx-bundle): Fixes to Mac OS X/Carbon port to
+        * Makefile.in (macosx-bundle): Fix Mac OS X/Carbon port to
         allow building in a different directory than source.  Uses some
         GNU Make extensions, but there is no other make on Mac OS X.
 
@@ -11534,7 +11634,7 @@
 
         * macterm.c (XTread_socket): Call KeyTranslate for control and
         meta to deal correctly shifted non-alpha characters, like C-S-5
-        being treated like C-%.  Does not look for shift key to deal
+        being treated like C-%.  Do not look for shift key to deal
         with masking off control-key with mac-reverse-ctrl-meta.
 
 2002-12-21  Richard M. Stallman  <rms@gnu.org>
diff --git a/src/Makefile.in b/src/Makefile.in
index 53725361a80..ec5ff5a4c5f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -686,6 +686,12 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO
 #define WINNT_SUPPORT
 #endif
 
+#ifdef HAVE_WINDOW_SYSTEM
+#define TOOLTIP_SUPPORT ${lispsource}tooltip.elc
+#else
+#define TOOLTIP_SUPPORT
+#endif
+
 /* List of Lisp files loaded into the dumped Emacs.  It's arranged
    like this because it's easier to generate it semi-mechanically from
    loadup.el this way.
@@ -780,6 +786,7 @@ lisp= \
         ${lispsource}emacs-lisp/timer.elc \
         ${lispsource}vc-hooks.elc \
         ${lispsource}ediff-hook.elc \
+        TOOLTIP_SUPPORT \
         VMS_SUPPORT \
         MSDOS_SUPPORT \
         WINNT_SUPPORT \
@@ -887,6 +894,7 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \
   ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \
   ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \
   ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \
+  ${dotdot}/lisp/tooltip.elc \
   ${dotdot}/lisp/international/ccl.elc \
   ${dotdot}/lisp/international/codepage.elc \
   ${dotdot}/lisp/mouse.elc ${dotdot}/lisp/international/fontset.elc \
@@ -1233,7 +1241,8 @@ abbrev.o buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \
   fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \
   scroll.o sysdep.o term.o widget.o window.o xdisp.o xfaces.o xfns.o xmenu.o \
   xterm.o xselect.o sound.o: macgui.h
-mac.o: mac.c process.h sysselect.h blockinput.h atimer.h systime.h $(config_h)
+mac.o: mac.c process.h sysselect.h blockinput.h atimer.h systime.h charset.h \
+  coding.h $(config_h)
 macfns.o: macfns.c charset.h macterm.h macgui.h frame.h window.h buffer.h \
   dispextern.h macgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \
   atimer.h systime.h epaths.h termhooks.h coding.h systime.h $(config_h)
diff --git a/src/image.c b/src/image.c
index 0e48b1d2bcb..6a1fc7aa795 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2423,7 +2423,7 @@ image_load_quartz2d (f, img, png_p)
           UNGCPRO;
           return 0;
         }
-      path = cfstring_create_with_utf8_cstring (SDATA (file));
+      path = cfstring_create_with_string (file);
       url = CFURLCreateWithFileSystemPath (NULL, path,
                                            kCFURLPOSIXPathStyle, 0);
       CFRelease (path);
diff --git a/src/keyboard.c b/src/keyboard.c
index 48c47502f85..9afcab10acd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -521,7 +521,7 @@ Lisp_Object Qmouse_fixup_help_message;
 /* Symbols to denote kinds of events.  */
 Lisp_Object Qfunction_key;
 Lisp_Object Qmouse_click;
-#ifdef WINDOWSNT
+#if defined (WINDOWSNT) || defined (MAC_OS)
 Lisp_Object Qlanguage_change;
 #endif
 Lisp_Object Qdrag_n_drop;
@@ -2100,7 +2100,11 @@ poll_for_input (timer)
      struct atimer *timer;
 {
   if (poll_suppress_count == 0)
+#ifdef SYNC_INPUT
+    interrupt_input_pending = 1;
+#else
     poll_for_input_1 ();
+#endif
 }
 
 #endif /* POLL_FOR_INPUT */
@@ -4026,11 +4030,16 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
             x_activate_menubar (XFRAME (event->frame_or_window));
         }
 #endif
-#ifdef WINDOWSNT
+#if defined (WINDOWSNT) || defined (MAC_OS)
       else if (event->kind == LANGUAGE_CHANGE_EVENT)
         {
+#ifdef MAC_OS
+          /* Make an event (language-change (KEY_SCRIPT)).  */
+          obj = Fcons (make_number (event->code), Qnil);
+#else
           /* Make an event (language-change (FRAME CHARSET LCID)).  */
           obj = Fcons (event->frame_or_window, Qnil);
+#endif
           obj = Fcons (Qlanguage_change, Fcons (obj, Qnil));
           kbd_fetch_ptr = event + 1;
         }
@@ -10976,7 +10985,7 @@ syms_of_keyboard ()
   staticpro (&Qfunction_key);
   Qmouse_click = intern ("mouse-click");
   staticpro (&Qmouse_click);
-#ifdef WINDOWSNT
+#if defined (WINDOWSNT) || defined (MAC_OS)
   Qlanguage_change = intern ("language-change");
   staticpro (&Qlanguage_change);
 #endif
diff --git a/src/mac.c b/src/mac.c
index da6a61633dc..68e3bdfa065 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -31,6 +31,8 @@ Boston, MA 02111-1307, USA.  */
 #include "sysselect.h"
 #include "systime.h"
 #include "blockinput.h"
+#include "charset.h"
+#include "coding.h"
 
 #include "macterm.h"
 
@@ -49,6 +51,7 @@ Boston, MA 02111-1307, USA.  */
 #include <Events.h>
 #include <Processes.h>
 #include <EPPC.h>
+#include <MacLocales.h>
 #endif  /* not HAVE_CARBON */
 
 #include <utime.h>
@@ -67,6 +70,12 @@ Boston, MA 02111-1307, USA.  */
 
 Lisp_Object QCLIPBOARD;
 
+/* The system script code. */
+static int mac_system_script_code;
+
+/* The system locale identifier string.  */
+static Lisp_Object Vmac_system_locale;
+
 /* An instance of the AppleScript component.  */
 static ComponentInstance as_scripting_component;
 /* The single script context used for all script executions.  */
@@ -258,7 +267,6 @@ posix_to_mac_pathname (const char *ufn, char *mfn, int mfnbuflen)
 #if TARGET_API_MAC_CARBON
 static Lisp_Object Qstring, Qnumber, Qboolean, Qdate, Qdata;
 static Lisp_Object Qarray, Qdictionary;
-extern Lisp_Object Qutf_8;
 #define DECODE_UTF_8(str) code_convert_string_norecord (str, Qutf_8, 0)
 
 struct cfdict_context
@@ -267,7 +275,7 @@ struct cfdict_context
   int with_tag, hash_bound;
 };
 
-/* C string to CFString. */
+/* C string to CFString.  */
 
 CFStringRef
 cfstring_create_with_utf8_cstring (c_str)
@@ -284,6 +292,37 @@ cfstring_create_with_utf8_cstring (c_str)
 }
 
 
+/* Lisp string to CFString.  */
+
+CFStringRef
+cfstring_create_with_string (s)
+     Lisp_Object s;
+{
+  CFStringRef string = NULL;
+
+  if (STRING_MULTIBYTE (s))
+    {
+      char *p, *end = SDATA (s) + SBYTES (s);
+
+      for (p = SDATA (s); p < end; p++)
+        if (!isascii (*p))
+          {
+            s = ENCODE_UTF_8 (s);
+            break;
+          }
+      string = CFStringCreateWithBytes (NULL, SDATA (s), SBYTES (s),
+                                        kCFStringEncodingUTF8, false);
+    }
+
+  if (string == NULL)
+    /* Failed to interpret as UTF 8.  Fall back on Mac Roman.  */
+    string = CFStringCreateWithBytes (NULL, SDATA (s), SBYTES (s),
+                                      kCFStringEncodingMacRoman, false);
+
+  return string;
+}
+
+
 /* From CFData to a lisp string.  Always returns a unibyte string.  */
 
 Lisp_Object
@@ -3704,11 +3743,11 @@ otherwise.  */)
   app_id = kCFPreferencesCurrentApplication;
   if (!NILP (application))
     {
-      app_id = cfstring_create_with_utf8_cstring (SDATA (application));
+      app_id = cfstring_create_with_string (application);
       if (app_id == NULL)
         goto out;
     }
-  key_str = cfstring_create_with_utf8_cstring (SDATA (XCAR (key)));
+  key_str = cfstring_create_with_string (XCAR (key));
   if (key_str == NULL)
     goto out;
   app_plist = CFPreferencesCopyAppValue (key_str, app_id);
@@ -3721,7 +3760,7 @@ otherwise.  */)
     {
       if (CFGetTypeID (plist) != CFDictionaryGetTypeID ())
         break;
-      key_str = cfstring_create_with_utf8_cstring (SDATA (XCAR (key)));
+      key_str = cfstring_create_with_string (XCAR (key));
       if (key_str == NULL)
         goto out;
       plist = CFDictionaryGetValue (plist, key_str);
@@ -4167,6 +4206,29 @@ 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 ()
 {
@@ -4197,6 +4259,16 @@ syms_of_mac ()
   defsubr (&Sdo_applescript);
   defsubr (&Smac_file_name_to_posix);
   defsubr (&Sposix_file_name_to_mac);
+
+  DEFVAR_INT ("mac-system-script-code", &mac_system_script_code,
+    doc: /* The system script code.  */);
+  mac_system_script_code = (ScriptCode) GetScriptManagerVariable (smSysScript);
+
+  DEFVAR_LISP ("mac-system-locale", &Vmac_system_locale,
+    doc: /* The system locale identifier string.
+This is not a POSIX locale ID, but an ICU locale ID.  So encoding
+information is not included.  */);
+  Vmac_system_locale = mac_get_system_locale ();
 }
 
 /* arch-tag: 29d30c1f-0c6b-4f88-8a6d-0558d7f9dbff
diff --git a/src/macfns.c b/src/macfns.c
index 357f993b0f9..b85c4f01795 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -1895,7 +1895,7 @@ x_set_name (f, name, explicit)
 #if TARGET_API_MAC_CARBON
         name = ENCODE_UTF_8 (name);
 #else
-        return;
+        name = ENCODE_SYSTEM (name);
 #endif
 
       BLOCK_INPUT;
@@ -1977,7 +1977,7 @@ x_set_title (f, name, old_name)
 #if TARGET_API_MAC_CARBON
         name = ENCODE_UTF_8 (name);
 #else
-        return;
+        name = ENCODE_SYSTEM (name);
 #endif
 
       BLOCK_INPUT;
@@ -3637,9 +3637,6 @@ x_create_tip_frame (dpyinfo, parms, text)
 
   check_mac ();
 
-  /* Use this general default value to start with until we know if
-     this frame has a specified name.  */
-  Vx_resource_name = Vinvocation_name;
 
 #ifdef MULTI_KBOARD
   kb = dpyinfo->kboard;
@@ -3653,7 +3650,6 @@ x_create_tip_frame (dpyinfo, parms, text)
       && !EQ (name, Qunbound)
       && !NILP (name))
     error ("Invalid frame name--not a string or nil");
-  Vx_resource_name = name;
 
   frame = Qnil;
   GCPRO3 (parms, name, frame);
@@ -4252,8 +4248,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
     options.optionFlags |= kNavSelectAllReadableItem;
     if (!NILP(prompt))
       {
-        message =
-          cfstring_create_with_utf8_cstring (SDATA (ENCODE_UTF_8 (prompt)));
+        message = cfstring_create_with_string (prompt);
         options.message = message;
       }
     /* Don't set the application, let it use default.
@@ -4362,7 +4357,12 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
                   filename[len++] = '/';
                 CFStringGetCString(reply.saveFileName, filename+len, 
                                    sizeof (filename) - len,
-                                   kCFStringEncodingUTF8);
+#if MAC_OSX
+                                   kCFStringEncodingUTF8
+#else
+                                   CFStringGetSystemEncoding ()
+#endif
+                                   );
               }
             file = DECODE_FILE (make_unibyte_string (filename,
                                                      strlen (filename)));
diff --git a/src/macterm.c b/src/macterm.c
index 569c728f80e..5aab6ec5364 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -95,6 +95,7 @@ Boston, MA 02111-1307, USA.  */
                         : controlKey)
 #define macAltKey      (NILP (Vmac_command_key_is_meta) ? cmdKey : optionKey)
 
+#define mac_window_to_frame(wp) (((mac_output *) GetWRefCon (wp))->mFP)
 
 
 /* Non-nil means Emacs uses toolkit scroll bars.  */
@@ -110,9 +111,8 @@ Lisp_Object Vmac_use_core_graphics;
 
 static int any_help_event_p;
 
-/* Non-zero means autoselect window with the mouse cursor.  */
-
-int x_autoselect_window_p;
+/* Last window where we saw the mouse.  Used by mouse-autoselect-window.  */
+static Lisp_Object last_window;
 
 /* Non-zero means make use of UNDERLINE_POSITION font properties.  */
 
@@ -273,14 +273,16 @@ static void x_font_min_bounds P_ ((XFontStruct *, int *, int *));
 static int x_compute_min_glyph_bounds P_ ((struct frame *));
 static void x_update_end P_ ((struct frame *));
 static void XTframe_up_to_date P_ ((struct frame *));
-static void XTreassert_line_highlight P_ ((int, int));
-static void x_change_line_highlight P_ ((int, int, int, int));
 static void XTset_terminal_modes P_ ((void));
 static void XTreset_terminal_modes P_ ((void));
 static void x_clear_frame P_ ((void));
 static void frame_highlight P_ ((struct frame *));
 static void frame_unhighlight P_ ((struct frame *));
 static void x_new_focus_frame P_ ((struct x_display_info *, struct frame *));
+static void mac_focus_changed P_ ((int, struct mac_display_info *,
+                                   struct frame *, struct input_event *));
+static void x_detect_focus_change P_ ((struct mac_display_info *,
+                                       EventRecord *, struct input_event *));
 static void XTframe_rehighlight P_ ((struct frame *));
 static void x_frame_rehighlight P_ ((struct x_display_info *));
 static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *));
@@ -1198,15 +1200,6 @@ XSetFont (display, gc, font)
 }
 
 
-static void
-XTextExtents16 (XFontStruct *font, XChar2b *text, int nchars,
-                     int *direction,int *font_ascent,
-                     int *font_descent, XCharStruct *cs)
-{
-  /* MAC_TODO: Use GetTextMetrics to do this and inline it below. */
-}
-
-
 /* x_sync is a no-op on Mac.  */
 void
 x_sync (f)
@@ -3494,6 +3487,14 @@ static void
 frame_highlight (f)
      struct frame *f;
 {
+  OSErr err;
+  ControlRef root_control;
+
+  BLOCK_INPUT;
+  err = GetRootControl (FRAME_MAC_WINDOW (f), &root_control);
+  if (err == noErr)
+    ActivateControl (root_control);
+  UNBLOCK_INPUT;
   x_update_cursor (f, 1);
 }
 
@@ -3501,6 +3502,14 @@ static void
 frame_unhighlight (f)
      struct frame *f;
 {
+  OSErr err;
+  ControlRef root_control;
+
+  BLOCK_INPUT;
+  err = GetRootControl (FRAME_MAC_WINDOW (f), &root_control);
+  if (err == noErr)
+    DeactivateControl (root_control);
+  UNBLOCK_INPUT;
   x_update_cursor (f, 1);
 }
 
@@ -3543,6 +3552,68 @@ x_new_focus_frame (dpyinfo, frame)
   x_frame_rehighlight (dpyinfo);
 }
 
+/* Handle FocusIn and FocusOut state changes for FRAME.
+   If FRAME has focus and there exists more than one frame, puts
+   a FOCUS_IN_EVENT into *BUFP.  */
+
+static void
+mac_focus_changed (type, dpyinfo, frame, bufp)
+     int type;
+     struct mac_display_info *dpyinfo;
+     struct frame *frame;
+     struct input_event *bufp;
+{
+  if (type == activeFlag)
+    {
+      if (dpyinfo->x_focus_event_frame != frame)
+        {
+          x_new_focus_frame (dpyinfo, frame);
+          dpyinfo->x_focus_event_frame = frame;
+
+          /* Don't stop displaying the initial startup message
+             for a switch-frame event we don't need.  */
+          if (GC_NILP (Vterminal_frame)
+              && GC_CONSP (Vframe_list)
+              && !GC_NILP (XCDR (Vframe_list)))
+            {
+              bufp->kind = FOCUS_IN_EVENT;
+              XSETFRAME (bufp->frame_or_window, frame);
+            }
+        }
+    }
+  else
+    {
+      if (dpyinfo->x_focus_event_frame == frame)
+        {
+          dpyinfo->x_focus_event_frame = 0;
+          x_new_focus_frame (dpyinfo, 0);
+        }
+    }
+}
+
+/* The focus may have changed.  Figure out if it is a real focus change,
+   by checking both FocusIn/Out and Enter/LeaveNotify events.
+
+   Returns FOCUS_IN_EVENT event in *BUFP. */
+
+static void
+x_detect_focus_change (dpyinfo, event, bufp)
+     struct mac_display_info *dpyinfo;
+     EventRecord *event;
+     struct input_event *bufp;
+{
+  struct frame *frame;
+
+  frame = mac_window_to_frame ((WindowPtr) event->message);
+  if (! frame)
+    return;
+
+  /* On Mac, this is only called from focus events, so no switch needed.  */
+  mac_focus_changed ((event->modifiers & activeFlag),
+                     dpyinfo, frame, bufp);
+}
+
+
 /* Handle an event saying the mouse has moved out of an Emacs frame.  */
 
 void
@@ -3980,25 +4051,19 @@ remember_mouse_glyph (f1, gx, gy)
 }
 
 
-static WindowPtr
-front_emacs_window ()
+static struct frame *
+mac_focus_frame (dpyinfo)
+     struct mac_display_info *dpyinfo;
 {
-#if TARGET_API_MAC_CARBON
-  WindowPtr wp = GetFrontWindowOfClass (kDocumentWindowClass, true);
-
-  while (wp && !is_emacs_window (wp))
-    wp = GetNextWindowOfClass (wp, kDocumentWindowClass, true);
-#else
-  WindowPtr wp = FrontWindow ();
-
-  while (wp && (wp == tip_window || !is_emacs_window (wp)))
-    wp = GetNextWindow (wp);
-#endif
-
-  return wp;
+  if (dpyinfo->x_focus_frame)
+    return dpyinfo->x_focus_frame;
+  else
+    /* Mac version may get events, such as a menu bar click, even when
+       all the frames are invisible.  In this case, we regard the
+       event came to the selected frame.  */
+    return SELECTED_FRAME ();
 }
 
-#define mac_window_to_frame(wp) (((mac_output *) GetWRefCon (wp))->mFP)
 
 /* Return the current position of the mouse.
    *fp should be a frame which indicates which display to ask about.
@@ -4031,13 +4096,10 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time)
 {
   Point mouse_pos;
   int ignore1, ignore2;
-  WindowPtr wp = front_emacs_window ();
-  struct frame *f;
+  struct frame *f = mac_focus_frame (FRAME_MAC_DISPLAY_INFO (*fp));
+  WindowPtr wp = FRAME_MAC_WINDOW (f);
   Lisp_Object frame, tail;
 
-  if (is_emacs_window(wp))
-    f = mac_window_to_frame (wp);
-
   BLOCK_INPUT;
 
   if (! NILP (last_mouse_scroll_bar) && insist == 0)
@@ -4604,7 +4666,12 @@ x_scroll_bar_report_motion (fp, bar_window, part, x, y, time)
      unsigned long *time;
 {
   struct scroll_bar *bar = XSCROLL_BAR (last_mouse_scroll_bar);
-  WindowPtr wp = front_emacs_window ();
+  ControlHandle ch = SCROLL_BAR_CONTROL_HANDLE (bar);
+#if TARGET_API_MAC_CARBON
+  WindowPtr wp = GetControlOwner (ch);
+#else
+  WindowPtr wp = (*ch)->contrlOwner;
+#endif
   Point mouse_pos;
   struct frame *f = mac_window_to_frame (wp);
   int win_y, top_range;
@@ -5050,7 +5117,7 @@ x_new_fontset (f, fontsetname)
     return Qnil;
 
   /* Since x_new_font doesn't update any fontset information, do it now.  */
-  FRAME_FONTSET(f) = fontset;
+  FRAME_FONTSET (f) = fontset;
 
   return build_string (fontsetname);
 }
@@ -5498,6 +5565,13 @@ x_make_frame_invisible (f)
 
   BLOCK_INPUT;
 
+  /* Before unmapping the window, update the WM_SIZE_HINTS property to claim
+     that the current position of the window is user-specified, rather than
+     program-specified, so that when the window is mapped again, it will be
+     placed at the same location, without forcing the user to position it
+     by hand again (they have already done that once for this window.)  */
+  x_wm_set_size_hint (f, (long) 0, 1);
+
   HideWindow (FRAME_MAC_WINDOW (f));
 
   /* We can't distinguish this from iconification
@@ -7070,7 +7144,6 @@ x_find_ccl_program (fontp)
 #include <Dialogs.h>
 #include <Script.h>
 #include <Types.h>
-#include <TextEncodingConverter.h>
 #include <Resources.h>
 
 #if __MWERKS__
@@ -7146,11 +7219,6 @@ Lisp_Object Vmac_pass_command_to_system;
 Lisp_Object Vmac_pass_control_to_system;
 #endif
 
-/* convert input from Mac keyboard (assumed to be in Mac Roman coding)
-   to this text encoding */
-int mac_keyboard_text_encoding;
-int current_mac_keyboard_text_encoding = kTextEncodingMacRoman;
-
 /* Set in term/mac-win.el to indicate that event loop can now generate
    drag and drop events.  */
 Lisp_Object Qmac_ready_for_drag_n_drop;
@@ -7460,21 +7528,6 @@ do_app_resume ()
 {
   /* Window-activate events will do the job. */
 #if 0
-  WindowPtr wp;
-  struct frame *f;
-
-  wp = front_emacs_window ();
-  if (wp)
-    {
-      f = mac_window_to_frame (wp);
-
-      if (f)
-        {
-          x_new_focus_frame (FRAME_MAC_DISPLAY_INFO (f), f);
-          activate_scroll_bars (f);
-        }
-    }
-
   app_is_suspended = false;
   app_sleep_time = WNE_SLEEP_AT_RESUME;
 #endif
@@ -7485,21 +7538,6 @@ do_app_suspend ()
 {
   /* Window-deactivate events will do the job. */
 #if 0
-  WindowPtr wp;
-  struct frame *f;
-
-  wp = front_emacs_window ();
-  if (wp)
-    {
-      f = mac_window_to_frame (wp);
-
-      if (f == FRAME_MAC_DISPLAY_INFO (f)->x_focus_frame)
-        {
-          x_new_focus_frame (FRAME_MAC_DISPLAY_INFO (f), 0);
-          deactivate_scroll_bars (f);
-        }
-    }
-
   app_is_suspended = true;
   app_sleep_time = WNE_SLEEP_AT_SUSPEND;
 #endif
@@ -7507,40 +7545,6 @@ do_app_suspend ()
 
 
 static void
-do_mouse_moved (mouse_pos, f)
-     Point mouse_pos;
-     FRAME_PTR *f;
-{
-  WindowPtr wp = front_emacs_window ();
-  struct x_display_info *dpyinfo;
-
-  if (wp)
-    {
-      *f = mac_window_to_frame (wp);
-      dpyinfo = FRAME_MAC_DISPLAY_INFO (*f);
-
-      if (dpyinfo->mouse_face_hidden)
-        {
-          dpyinfo->mouse_face_hidden = 0;
-          clear_mouse_face (dpyinfo);
-        }
-
-      SetPortWindowPort (wp);
-
-      GlobalToLocal (&mouse_pos);
-
-      if (dpyinfo->grabbed && tracked_scroll_bar)
-        x_scroll_bar_note_movement (tracked_scroll_bar,
-                                    mouse_pos.v
-                                    - XINT (tracked_scroll_bar->top),
-                                    TickCount() * (1000 / 60));
-      else
-        note_mouse_movement (*f, &mouse_pos);
-    }
-}
-
-
-static void
 do_apple_menu (SInt16 menu_item)
 {
 #if !TARGET_API_MAC_CARBON
@@ -7576,7 +7580,7 @@ do_menu_choice (SInt32 menu_choice)
 
     default:
       {
-        struct frame *f = mac_window_to_frame (front_emacs_window ());
+        struct frame *f = mac_focus_frame (&one_mac_display_info);
         MenuHandle menu = GetMenuHandle (menu_id);
         if (menu)
           {
@@ -7654,13 +7658,14 @@ do_zoom_window (WindowPtr w, int zoom_in_or_out)
   Point top_left;
   int w_title_height, columns, rows, width, height;
   struct frame *f = mac_window_to_frame (w);
+  struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
 
 #if TARGET_API_MAC_CARBON
   {
     Point standard_size;
 
     standard_size.h = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, DEFAULT_NUM_COLS);
-    standard_size.v = FRAME_MAC_DISPLAY_INFO (f)->height;
+    standard_size.v = dpyinfo->height;
 
     if (IsWindowInStandardState (w, &standard_size, &zoom_rect))
       zoom_in_or_out = inZoomIn;
@@ -7716,7 +7721,7 @@ do_zoom_window (WindowPtr w, int zoom_in_or_out)
         = zoom_rect;
     }
 
-  ZoomWindow (w, zoom_in_or_out, w == front_emacs_window ());
+  ZoomWindow (w, zoom_in_or_out, f == mac_focus_frame (dpyinfo));
 
   SetPort (save_port);
 #endif /* not TARGET_API_MAC_CARBON */
@@ -8582,10 +8587,13 @@ XTread_socket (sd, expected, hold_quit)
               {
                 SInt32 delta;
                 Point point;
-                WindowPtr window_ptr = front_emacs_window ();
+                struct frame *f = mac_focus_frame (dpyinfo);
+                WindowPtr window_ptr;
 
-                if (!IsValidWindowPtr (window_ptr))
+                if (!f)
                   {
+                    /* Beep if wheel move occurs when all the frames
+                       are invisible.  */
                     SysBeep(1);
                     break;
                   }
@@ -8601,6 +8609,7 @@ XTread_socket (sd, expected, hold_quit)
                 inev.modifiers = (mac_event_to_emacs_modifiers (eventRef)
                                   | ((delta < 0) ? down_modifier
                                      : up_modifier));
+                window_ptr = FRAME_MAC_WINDOW (f);
                 SetPortWindowPort (window_ptr);
                 GlobalToLocal (&point);
                 XSETINT (inev.x, point.h);
@@ -8659,14 +8668,14 @@ XTread_socket (sd, expected, hold_quit)
             switch (part_code)
               {
               case inMenuBar:
-                f = mac_window_to_frame (front_emacs_window ());
+                f = mac_focus_frame (dpyinfo);
                 saved_menu_event_location = er.where;
                 inev.kind = MENU_BAR_ACTIVATE_EVENT;
                 XSETFRAME (inev.frame_or_window, f);
                 break;
 
               case inContent:
-                if (window_ptr != front_emacs_window ())
+                if (window_ptr != FRAME_MAC_WINDOW (mac_focus_frame (dpyinfo)))
                   SelectWindow (window_ptr);
                 else
                   {
@@ -8857,7 +8866,61 @@ XTread_socket (sd, expected, hold_quit)
               help_echo_string = help_echo_object = help_echo_window = Qnil;
               help_echo_pos = -1;
 
-              do_mouse_moved (er.where, &f);
+              if (dpyinfo->grabbed && last_mouse_frame
+                  && FRAME_LIVE_P (last_mouse_frame))
+                f = last_mouse_frame;
+              else
+                f = dpyinfo->x_focus_frame;
+
+              if (dpyinfo->mouse_face_hidden)
+                {
+                  dpyinfo->mouse_face_hidden = 0;
+                  clear_mouse_face (dpyinfo);
+                }
+
+              if (f)
+                {
+                  WindowPtr wp = FRAME_MAC_WINDOW (f);
+                  Point mouse_pos = er.where;
+
+                  SetPortWindowPort (wp);
+
+                  GlobalToLocal (&mouse_pos);
+
+                  if (dpyinfo->grabbed && tracked_scroll_bar)
+                    x_scroll_bar_note_movement (tracked_scroll_bar,
+                                                mouse_pos.v
+                                                - XINT (tracked_scroll_bar->top),
+                                                TickCount() * (1000 / 60));
+                  else
+                    {
+                      /* Generate SELECT_WINDOW_EVENTs when needed.  */
+                      if (mouse_autoselect_window)
+                        {
+                          Lisp_Object window;
+
+                          window = window_from_coordinates (f,
+                                                            mouse_pos.h,
+                                                            mouse_pos.v,
+                                                            0, 0, 0, 0);
+
+                          /* Window will be selected only when it is
+                             not selected now and last mouse movement
+                             event was not in it.  Minibuffer window
+                             will be selected iff it is active.  */
+                          if (WINDOWP (window)
+                              && !EQ (window, last_window)
+                              && !EQ (window, selected_window))
+                            {
+                              inev.kind = SELECT_WINDOW_EVENT;
+                              inev.frame_or_window = window;
+                            }
+
+                          last_window=window;
+                        }
+                      note_mouse_movement (f, &mouse_pos);
+                    }
+                }
 
               /* If the contents of the global variable
                  help_echo_string has changed, generate a
@@ -8871,7 +8934,6 @@ XTread_socket (sd, expected, hold_quit)
         case activateEvt:
           {
             WindowPtr window_ptr = (WindowPtr) er.message;
-            ControlRef root_control;
 
 #if USE_CARBON_EVENTS
             if (SendEventToEventTarget (eventRef, toolbox_dispatcher)
@@ -8887,16 +8949,12 @@ XTread_socket (sd, expected, hold_quit)
             if (!is_emacs_window (window_ptr))
               break;
 
-            f = mac_window_to_frame (window_ptr);
-            GetRootControl (window_ptr, &root_control);
-
             if ((er.modifiers & activeFlag) != 0)
               {
                 /* A window has been activated */
                 Point mouse_loc = er.where;
 
-                x_new_focus_frame (dpyinfo, f);
-                ActivateControl (root_control);
+                x_detect_focus_change (dpyinfo, &er, &inev);
 
                 SetPortWindowPort (window_ptr);
                 GlobalToLocal (&mouse_loc);
@@ -8910,13 +8968,9 @@ XTread_socket (sd, expected, hold_quit)
                 /* A window has been deactivated */
                 dpyinfo->grabbed = 0;
 
-                if (f == dpyinfo->x_focus_frame)
-                  {
-                    x_new_focus_frame (dpyinfo, 0);
-                    DeactivateControl (root_control);
-                  }
-
+                x_detect_focus_change (dpyinfo, &er, &inev);
 
+                f = mac_window_to_frame (window_ptr);
                 if (f == dpyinfo->mouse_face_mouse_frame)
                   {
                     /* If we move outside the frame, then we're
@@ -8957,13 +9011,31 @@ XTread_socket (sd, expected, hold_quit)
                 break;
 #endif
 
-#if TARGET_API_MAC_CARBON
-            if (!IsValidWindowPtr (front_emacs_window ()))
+            if (dpyinfo->x_focus_frame == NULL)
               {
+                /* Beep if keyboard input occurs when all the frames
+                   are invisible.  */
                 SysBeep (1);
                 break;
               }
-#endif
+
+            {
+              static SInt16 last_key_script = -1;
+              SInt16 current_key_script = GetScriptManagerVariable (smKeyScript);
+
+              if (last_key_script != current_key_script)
+                {
+                  struct input_event event;
+
+                  EVENT_INIT (event);
+                  event.kind = LANGUAGE_CHANGE_EVENT;
+                  event.arg = Qnil;
+                  event.code = current_key_script;
+                  kbd_buffer_store_event (&event);
+                  count++;
+                }
+              last_key_script = current_key_script;
+            }
 
             ObscureCursor ();
 
@@ -8998,95 +9070,32 @@ XTread_socket (sd, expected, hold_quit)
                     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 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.kind = ASCII_KEYSTROKE_EVENT;
               }
           }
 
-          /* If variable mac-convert-keyboard-input-to-latin-1 is
-             non-nil, convert non-ASCII characters typed at the Mac
-             keyboard (presumed to be in the Mac Roman encoding) to
-             iso-latin-1 encoding before they are passed to Emacs.
-             This enables the Mac keyboard to be used to enter
-             non-ASCII iso-latin-1 characters directly.  */
-          if (mac_keyboard_text_encoding != kTextEncodingMacRoman
-              && inev.kind == ASCII_KEYSTROKE_EVENT && inev.code >= 128)
-            {
-              static TECObjectRef converter = NULL;
-              OSStatus the_err = noErr;
-              OSStatus convert_status = noErr;
-
-              if (converter ==  NULL)
-                {
-                  the_err = TECCreateConverter (&converter,
-                                                kTextEncodingMacRoman,
-                                                mac_keyboard_text_encoding);
-                  current_mac_keyboard_text_encoding
-                    = mac_keyboard_text_encoding;
-                }
-              else if (mac_keyboard_text_encoding
-                       != current_mac_keyboard_text_encoding)
-                {
-                  /* Free the converter for the current encoding
-                     before creating a new one.  */
-                  TECDisposeConverter (converter);
-                  the_err = TECCreateConverter (&converter,
-                                                kTextEncodingMacRoman,
-                                                mac_keyboard_text_encoding);
-                  current_mac_keyboard_text_encoding
-                    = mac_keyboard_text_encoding;
-                }
-
-              if (the_err == noErr)
-                {
-                  unsigned char ch = inev.code;
-                  ByteCount actual_input_length, actual_output_length;
-                  unsigned char outbuf[32];
-
-                  convert_status = TECConvertText (converter, &ch, 1,
-                                                   &actual_input_length,
-                                                   outbuf, 1,
-                                                   &actual_output_length);
-                  if (convert_status == noErr
-                      && actual_input_length == 1
-                      && actual_output_length == 1)
-                    inev.code = *outbuf;
-
-                  /* Reset internal states of the converter object.
-                     If it fails, create another one. */
-                  convert_status = TECFlushText (converter, outbuf,
-                                                 sizeof (outbuf),
-                                                 &actual_output_length);
-                  if (convert_status != noErr)
-                    {
-                      TECDisposeConverter (converter);
-                      TECCreateConverter (&converter,
-                                          kTextEncodingMacRoman,
-                                          mac_keyboard_text_encoding);
-                    }
-                }
-            }
-
 #if USE_CARBON_EVENTS
           inev.modifiers = mac_event_to_emacs_modifiers (eventRef);
 #else
           inev.modifiers = mac_to_emacs_modifiers (er.modifiers);
 #endif
-          XSETFRAME (inev.frame_or_window,
-                     mac_window_to_frame (front_emacs_window ()));
+          XSETFRAME (inev.frame_or_window, mac_focus_frame (dpyinfo));
           inev.timestamp = er.when * (1000 / 60);  /* ticks to milliseconds */
           break;
 
@@ -9099,22 +9108,10 @@ XTread_socket (sd, expected, hold_quit)
              constuct_drag_n_drop in w32term.c.  */
           if (!NILP (drag_and_drop_file_list))
             {
-              struct frame *f = NULL;
+              struct frame *f = mac_focus_frame (dpyinfo);
               WindowPtr wp;
               Lisp_Object frame;
 
-              wp = front_emacs_window ();
-
-              if (!wp)
-                {
-                  struct frame *f = XFRAME (XCAR (Vframe_list));
-                  CollapseWindow (FRAME_MAC_WINDOW (f), false);
-                  wp = front_emacs_window ();
-                }
-
-              if (wp)
-                f = mac_window_to_frame (wp);
-
               inev.kind = DRAG_N_DROP_EVENT;
               inev.code = 0;
               inev.timestamp = er.when * (1000 / 60);
@@ -9131,10 +9128,12 @@ XTread_socket (sd, expected, hold_quit)
               XSETFRAME (frame, f);
               inev.frame_or_window = Fcons (frame, drag_and_drop_file_list);
 
+#if 0
               /* Regardless of whether Emacs was suspended or in the
                  foreground, ask it to redraw its entire screen.
                  Otherwise parts of the screen can be left in an
                  inconsistent state.  */
+              wp = FRAME_MAC_WINDOW (f);
               if (wp)
 #if TARGET_API_MAC_CARBON
                 {
@@ -9146,6 +9145,7 @@ XTread_socket (sd, expected, hold_quit)
 #else /* not TARGET_API_MAC_CARBON */
                 InvalRect (&(wp->portRect));
 #endif /* not TARGET_API_MAC_CARBON */
+#endif
             }
         default:
           break;
@@ -9625,7 +9625,7 @@ mac_check_for_quit_char ()
       e.arg = Qnil;
       e.modifiers = NULL;
       e.timestamp = EventTimeToTicks (GetEventTime (event)) * (1000/60);
-      XSETFRAME (e.frame_or_window, mac_window_to_frame (front_emacs_window ()));
+      XSETFRAME (e.frame_or_window, mac_focus_frame (&one_mac_display_info));
       /* Remove event from queue to prevent looping. */
       RemoveEventFromQueue (GetMainEventQueue (), event);
       ReleaseEvent (event);
@@ -9819,10 +9819,6 @@ syms_of_macterm ()
   Qeuc_kr = intern ("euc-kr");
   staticpro (&Qeuc_kr);
 
-  DEFVAR_BOOL ("x-autoselect-window", &x_autoselect_window_p,
-    doc: /* *Non-nil means autoselect window with mouse pointer.  */);
-  x_autoselect_window_p = 0;
-
   DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars,
                doc: /* If not nil, Emacs uses toolkit scroll bars.  */);
   Vx_toolkit_scroll_bars = Qt;
@@ -9882,10 +9878,6 @@ Toolbox for processing before Emacs sees it.  */);
 Toolbox for processing before Emacs sees it.  */);
   Vmac_pass_control_to_system = Qt;
 
-  DEFVAR_LISP ("mac-pass-control-to-system", &Vmac_pass_control_to_system,
-   doc: /* If non-nil, the Mac \"Control\" key is passed on to the Mac
-Toolbox for processing before Emacs sees it.  */);
-  Vmac_pass_control_to_system = Qt;
 #endif
 
   DEFVAR_LISP ("mac-allow-anti-aliasing", &Vmac_use_core_graphics,
@@ -9893,21 +9885,6 @@ Toolbox for processing before Emacs sees it.  */);
 The text will be rendered using Core Graphics text rendering which
 may anti-alias the text.  */);
   Vmac_use_core_graphics = Qnil;
-
-  DEFVAR_INT ("mac-keyboard-text-encoding", &mac_keyboard_text_encoding,
-    doc: /* One of the Text Encoding Base constant values defined in the
-Basic Text Constants section of Inside Macintosh - Text Encoding
-Conversion Manager.  Its value determines the encoding characters
-typed at the Mac keyboard (presumed to be in the MacRoman encoding)
-will convert into.  E.g., if it is set to kTextEncodingMacRoman (0),
-its default value, no conversion takes place.  If it is set to
-kTextEncodingISOLatin1 (0x201) or kTextEncodingISOLatin2 (0x202),
-characters typed on Mac keyboard are first converted into the
-ISO Latin-1 or ISO Latin-2 encoding, respectively before being
-passed to Emacs.  Together with Emacs's set-keyboard-coding-system
-command, this enables the Mac keyboard to be used to enter non-ASCII
-characters directly.  */);
-  mac_keyboard_text_encoding = kTextEncodingMacRoman;
 }
 
 /* arch-tag: f2259165-4454-4c04-a029-a133c8af7b5b
diff --git a/src/macterm.h b/src/macterm.h
index 3ce3e08947a..705e5d7ac3b 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -195,14 +195,14 @@ struct mac_display_info
   int bitmaps_last;
 
   /* The frame (if any) which has the window that has keyboard focus.
-     Zero if none.  This is examined by Ffocus_frame in w32fns.c.  Note
+     Zero if none.  This is examined by Ffocus_frame in macfns.c.  Note
      that a mere EnterNotify event can set this; if you need to know the
      last frame specified in a FocusIn or FocusOut event, use
-     w32_focus_event_frame.  */
+     x_focus_event_frame.  */
   struct frame *x_focus_frame;
 
   /* The last frame mentioned in a FocusIn or FocusOut event.  This is
-     separate from w32_focus_frame, because whether or not LeaveNotify
+     separate from x_focus_frame, because whether or not LeaveNotify
      events cause us to lose focus depends on whether or not we have
      received a FocusIn event for it.  */
   struct frame *x_focus_event_frame;
@@ -210,7 +210,7 @@ struct mac_display_info
   /* The frame which currently has the visual highlight, and should get
      keyboard input (other sorts of input have the frame encoded in the
      event).  It points to the focus frame's selected window's
-     frame.  It differs from w32_focus_frame when we're using a global
+     frame.  It differs from x_focus_frame when we're using a global
      minibuffer.  */
   struct frame *x_highlight_frame;
 
@@ -418,7 +418,7 @@ typedef struct mac_output mac_output;
 
 #define FRAME_SIZE_HINTS(f) ((f)->output_data.mac->size_hints)
 
-/* This gives the w32_display_info structure for the display F is on.  */
+/* This gives the mac_display_info structure for the display F is on.  */
 #define FRAME_MAC_DISPLAY_INFO(f) (&one_mac_display_info)
 #define FRAME_X_DISPLAY_INFO(f) (&one_mac_display_info)
 
@@ -624,6 +624,7 @@ extern OSErr fsspec_to_posix_pathname P_ ((const FSSpec *, char *, int));
 extern void mac_clear_font_name_table P_ ((void));
 #if TARGET_API_MAC_CARBON
 extern CFStringRef cfstring_create_with_utf8_cstring P_ ((const char *));
+extern CFStringRef cfstring_create_with_string P_ ((Lisp_Object));
 extern Lisp_Object cfdata_to_lisp P_ ((CFDataRef));
 extern Lisp_Object cfstring_to_lisp P_ ((CFStringRef));
 extern Lisp_Object cfnumber_to_lisp P_ ((CFNumberRef));
diff --git a/src/term.c b/src/term.c
index 274e453a9d8..bc30e3fb0d8 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1289,7 +1289,26 @@ static struct fkey_table keys[] =
   {"k6", "f6"},
   {"k7", "f7"},
   {"k8", "f8"},
-  {"k9", "f9"}
+  {"k9", "f9"},
+
+  {"&0", "S-cancel"},    /*shifted cancel key*/
+  {"&9", "S-begin"},     /*shifted begin key*/
+  {"*0", "S-find"},      /*shifted find key*/
+  {"*1", "S-execute"},   /*shifted execute? actually shifted command key*/
+  {"*4", "S-delete"},    /*shifted delete-character key*/
+  {"*7", "S-end"},       /*shifted end key*/
+  {"*8", "S-clearline"}, /*shifted clear-to end-of-line key*/
+  {"#1", "S-help"},      /*shifted help key*/
+  {"#2", "S-home"},      /*shifted home key*/
+  {"#3", "S-insert"},    /*shifted insert-character key*/
+  {"#4", "S-left"},      /*shifted left-arrow key*/
+  {"%d", "S-menu"},      /*shifted menu? actually shifted options key*/
+  {"%c", "S-next"},      /*shifted next key*/
+  {"%e", "S-prior"},     /*shifted previous key*/
+  {"%f", "S-print"},     /*shifted print key*/
+  {"%g", "S-redo"},      /*shifted redo key*/
+  {"%i", "S-right"},     /*shifted right-arrow key*/
+  {"!3", "S-undo"}       /*shifted undo key*/
   };
 
 static char **term_get_fkeys_arg;
diff --git a/src/termhooks.h b/src/termhooks.h
index 9aedede55bf..d424ad75e4a 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -103,10 +103,11 @@ enum event_kind
                                    the wheel event occurred in.
                                    .timestamp gives a timestamp (in
                                    milliseconds) for the event.  */
-#ifdef WINDOWSNT
-  LANGUAGE_CHANGE_EVENT,        /* A LANGUAGE_CHANGE_EVENT is generated
-                                   on WINDOWSNT when the keyboard layout
-                                   or input language is changed by the
+#if defined (WINDOWSNT) || defined (MAC_OS)
+  LANGUAGE_CHANGE_EVENT,        /* A LANGUAGE_CHANGE_EVENT is
+                                   generated on WINDOWSNT or Mac OS
+                                   when the keyboard layout or input
+                                   language is changed by the
                                    user.  */
 #endif
   SCROLL_BAR_CLICK_EVENT,       /* .code gives the number of the mouse button
diff --git a/src/window.c b/src/window.c
index e16416d6fb2..a1b3c879bb5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,7 +1,7 @@
 /* Window creation, deletion and examination for GNU Emacs.
    Does not include redisplay.
-   Copyright (C) 1985,86,87, 1993,94,95,96,97,98, 2000,01,02,03,04
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
+     2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -5596,7 +5596,20 @@ the return value is nil.  Otherwise the value is t.  */)
       if (XBUFFER (new_current_buffer) == current_buffer)
         old_point = PT;
       else
-        old_point = BUF_PT (XBUFFER (new_current_buffer));
+        /* BUF_PT (XBUFFER (new_current_buffer)) gives us the position of
+           point in new_current_buffer as of the last time this buffer was
+           used.  This can be non-deterministic since it can be changed by
+           things like jit-lock by mere temporary selection of some random
+           window that happens to show this buffer.
+           So if possible we want this arbitrary choice of "which point" to
+           be the one from the to-be-selected-window so as to prevent this
+           window's cursor from being copied from another window.  */
+        if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer)
+            /* If current_window = selected_window, its point is in BUF_PT.  */
+            && !EQ (selected_window, data->current_window))
+          old_point = XMARKER (XWINDOW (data->current_window)->pointm)->charpos;
+        else
+          old_point = BUF_PT (XBUFFER (new_current_buffer));
     }
 
   frame = XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame;
diff --git a/src/xdisp.c b/src/xdisp.c
index c545b6b2bc2..c832f1fa5e0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -567,12 +567,21 @@ Lisp_Object Vmessage_log_max;
 
 static Lisp_Object Vmessages_buffer_name;
 
-/* Current, index 0, and last displayed echo area message.  Either
-   buffers from echo_buffers, or nil to indicate no message.  */
+/* Index 0 is the buffer that holds the current (desired) echo area message,
+   or nil if none is desired right now.
+
+   Index 1 is the buffer that holds the previously displayed echo area message,
+   or nil to indicate no message.  This is normally what's on the screen now.
+
+   These two can point to the same buffer.  That happens when the last
+   message output by the user (or made by echoing) has been displayed.  */
 
 Lisp_Object echo_area_buffer[2];
 
-/* The buffers referenced from echo_area_buffer.  */
+/* Permanent pointers to the two buffers that are used for echo area
+   purposes.  Once the two buffers are made, and their pointers are
+   placed here, these two slots remain unchanged unless those buffers
+   need to be created afresh.  */
 
 static Lisp_Object echo_buffer[2];
 
@@ -7213,10 +7222,6 @@ ensure_echo_area_buffers ()
    WHICH > 0 means use echo_area_buffer[1].  If that is nil, choose a
    suitable buffer from echo_buffer[] and clear it.
 
-   If WHICH < 0, set echo_area_buffer[1] to echo_area_buffer[0], so
-   that the current message becomes the last displayed one, make
-   choose a suitable buffer for echo_area_buffer[0], and clear it.
-
    Value is what FN returns.  */
 
 static int
@@ -7241,17 +7246,6 @@ with_echo_area_buffer (w, which, fn, a1, a2, a3, a4)
     this_one = 0, the_other = 1;
   else if (which > 0)
     this_one = 1, the_other = 0;
-  else
-    {
-      this_one = 0, the_other = 1;
-      clear_buffer_p = 1;
-
-      /* We need a fresh one in case the current echo buffer equals
-         the one containing the last displayed echo area message.  */
-      if (!NILP (echo_area_buffer[this_one])
-          && EQ (echo_area_buffer[this_one], echo_area_buffer[the_other]))
-        echo_area_buffer[this_one] = Qnil;
-    }
 
   /* Choose a suitable buffer from echo_buffer[] is we don't
      have one.  */
@@ -7871,7 +7865,7 @@ set_message (s, string, nbytes, multibyte_p)
     = ((s && multibyte_p)
        || (STRINGP (string) && STRING_MULTIBYTE (string)));
 
-  with_echo_area_buffer (0, -1, set_message_1,
+  with_echo_area_buffer (0, 0, set_message_1,
                          (EMACS_INT) s, string, nbytes, multibyte_p);
   message_buf_print = 0;
   help_echo_showing_p = 0;
@@ -7903,6 +7897,7 @@ set_message_1 (a1, a2, nbytes, multibyte_p)
 
   /* Insert new message at BEG.  */
   TEMP_SET_PT_BOTH (BEG, BEG_BYTE);
+  Ferase_buffer ();
 
   if (STRINGP (string))
     {
@@ -8118,10 +8113,8 @@ echo_area_display (update_frame_p)
   else if (!EQ (mini_window, selected_window))
     windows_or_buffers_changed++;
 
-  /* Last displayed message is now the current message.  */
+  /* The current message is now also the last one displayed.  */
   echo_area_buffer[1] = echo_area_buffer[0];
-  /* Inform read_char that we're not echoing.  */
-  echo_message_buffer = Qnil;
 
   /* Prevent redisplay optimization in redisplay_internal by resetting
      this_line_start_pos.  This is done because the mini-buffer now