Merged from miles@gnu.org--gnu-2005 (patch 37-38, 162-182)

Patches applied:

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-167
   Tweak obsolete function/variable warning message

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

13 files changed, 282 insertions, 130 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 854a8673458..f0f27785e3d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,64 @@
+2005-03-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (keycode_to_xkeysym_table): Change mapping so that it
+        coincide with that in Apple X11 except `clear', `enter' on
+        laptops, and fn + `enter' on laptops.
+
+2005-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xmenu.c (ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
+        (list_of_panes, list_of_items, Fx_popup_menu): Use XCAR/XCDR.
+        (digest_single_submenu, xmenu_show): Use ENCODE_MENU_STRING.
+
+        * xfns.c (xic_defaut_fontset): New constant.
+        (xic_create_fontsetname): New function.
+        Extracted from create_frame_xic.  Try to generate a slightly
+        better fontset.
+        (xic_create_xfontset): Use it.
+        (create_frame_xic): Simplify.
+
+2005-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Fmake_symbolic_link): Fix last change.
+
+2005-03-11  Richard M. Stallman  <rms@gnu.org>
+
+        * fileio.c (Frename_file, Fadd_name_to_file)
+        (Fmake_symbolic_link): If NEWNAME or LINKNAME is a directory,
+        expand the basename of FILE relative to it.
+
+2005-03-11  Kenichi Handa  <handa@m17n.org>
+
+        * fileio.c (Finsert_file_contents): Call Fcheck_coding_system
+        before calling setup_coding_system so that autoloading of a coding
+        system work.
+
+2005-03-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xfns.c (hourglass_started): New function.
+
+        * dispextern.h: Declare hourglass_started.
+
+        * keyboard.c (Fexecute_extended_command): Restart hourglass
+        after call to Fcompleting_read if already started.
+
+        * gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
+        GTK main loop is entered in xterm.c, thus doing the redraw.
+
+2005-03-10  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (pos_visible_p): Fix X value in last line of buffer.
+
+2005-03-08  Kenichi Handa  <handa@m17n.org>
+
+        * frame.c (x_set_font): Call set_default_ascii_font if an
+        available font is found.
+
+        * fontset.c (set_default_ascii_font): New function.
+        (syms_of_fontset): Don't set FONTSET_ASCII (Vdefault_fontset) here.
+
+        * fontset.h (set_default_ascii_font): Extern it.
+
 2005-03-07  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (CLEAR_IMAGE_CACHE_COUNT): New const.
@@ -55,13 +116,11 @@
         * emacs.c (main): Change `#ifdef HAVE_CARBON' to `#if
         defined (MAC_OSX) && defined (HAVE_CARBON)'.
 
-        * image.c [!MAC_OSX && TARGET_API_MAC_CARBON]: Include
-        QuickTime.h.
+        * image.c [!MAC_OSX && TARGET_API_MAC_CARBON]: Include QuickTime.h.
 
         * mac.c [!MAC_OSX && HAVE_CARBON]: Include Carbon.h.
         [!MAC_OSX] (select) [TARGET_API_MAC_CARBON]: Use ReceiveNextEvent.
-        (posix_pathname_to_fsspec, fsspec_to_posix_pathname): New
-        functions.
+        (posix_pathname_to_fsspec, fsspec_to_posix_pathname): New functions.
         (mac_clear_font_name_table): Move extern to macterm.h.
 
         * macfns.c (install_window_handler): Move extern to macterm.h.
@@ -69,16 +128,15 @@
         valid.  Don't check !NILP (dir) because it is already checked with
         CHECK_STRING.
         (Fx_file_dialog) [!MAC_OSX]: Use FSSpec instead of FSRef for
-        specifying the default location and obtaining the selected
-        filename.
+        specifying the default location and obtaining the selected filename.
 
         * macgui.h [!MAC_OSX && HAVE_CARBON]: Include Carbon.h.
 
         * macmenu.c [TARGET_API_MAC_CARBON]: Don't include headers that
         are included via Carbon.h.
 
-        * macterm.c [TARGET_API_MAC_CARBON && !MAC_OSX]: Define
-        USE_CARBON_EVENTS to 1.
+        * macterm.c [TARGET_API_MAC_CARBON && !MAC_OSX]:
+        Define USE_CARBON_EVENTS to 1.
         (qd) [__MRC__ && TARGET_API_MAC_CARBON]: Don't declare.
         (x_free_frame_resources): Call remove_window_handler for
         non-tooltip windows.
@@ -91,12 +149,12 @@
         (install_window_handler) [TARGET_API_MAC_CARBON]: Create UPPs for
         drag-and-drop handler functions and register them.
         (remove_window_handler): New function.
-        (do_ae_open_documents, mac_do_receive_drag) [!MAC_OSX]: Use
-        fsspec_to_posix_pathname.
+        (do_ae_open_documents, mac_do_receive_drag) [!MAC_OSX]:
+        Use fsspec_to_posix_pathname.
         (main): Change #if !TARGET_API_MAC_CARBON to #ifdef MAC_OS8.
         (XTread_socket) [!MAC_OSX]: Don't pass keyboard events to TSM.
-        [MAC_OS8] (make_mac_terminal_frame) [TARGET_API_MAC_CARBON]: Set
-        default cursors.
+        [MAC_OS8] (make_mac_terminal_frame) [TARGET_API_MAC_CARBON]:
+        Set default cursors.
         (mac_initialize) [USE_CARBON_EVENTS && !MAC_OSX] : Don't call
         init_service_handler or init_quit_char_handler.
         (mac_initialize) [!MAC_OSX]: Don't call MakeMeTheFrontProcess.
diff --git a/src/coding.c b/src/coding.c
index 9cd493ab062..6a3868b016d 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7819,7 +7819,10 @@ updated by the functions `make-coding-system' and
 On detecting a coding system, Emacs tries code detection algorithms
 associated with each coding-category one by one in this order.  When
 one algorithm agrees with a byte sequence of source text, the coding
-system bound to the corresponding coding-category is selected.  */);
+system bound to the corresponding coding-category is selected.
+
+When you modify this variable, `update-coding-systems-internal' must
+be called.  */);
   {
     int i;
 
diff --git a/src/dispextern.h b/src/dispextern.h
index 60f24feef5b..8861a9705c4 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2808,6 +2808,7 @@ EXFUN (Fx_show_tip, 6);
 EXFUN (Fx_hide_tip, 0);
 extern void start_hourglass P_ ((void));
 extern void cancel_hourglass P_ ((void));
+extern int hourglass_started P_ ((void));
 extern int display_hourglass_p;
 
 /* Returns the background color of IMG, calculating one heuristically if
diff --git a/src/fileio.c b/src/fileio.c
index 3212c51d096..1eaad3192d7 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1,6 +1,6 @@
 /* File IO for GNU Emacs.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
-     1999, 2000, 2001, 2003, 2004  Free Software Foundation, Inc.
+     1999, 2000, 2001, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2693,7 +2693,11 @@ This is what happens in interactive use with M-x.  */)
   CHECK_STRING (file);
   CHECK_STRING (newname);
   file = Fexpand_file_name (file, Qnil);
-  newname = Fexpand_file_name (newname, Qnil);
+
+  if (!NILP (Ffile_directory_p (newname)))
+    newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname);
+  else
+    newname = Fexpand_file_name (newname, Qnil);
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */
@@ -2776,7 +2780,11 @@ This is what happens in interactive use with M-x.  */)
   CHECK_STRING (file);
   CHECK_STRING (newname);
   file = Fexpand_file_name (file, Qnil);
-  newname = Fexpand_file_name (newname, Qnil);
+
+  if (!NILP (Ffile_directory_p (newname)))
+    newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname);
+  else
+    newname = Fexpand_file_name (newname, Qnil);
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */
@@ -2843,7 +2851,11 @@ This happens for interactive use with M-x.  */)
      we want to permit links to relative file names.  */
   if (SREF (filename, 0) == '~')
     filename = Fexpand_file_name (filename, Qnil);
-  linkname = Fexpand_file_name (linkname, Qnil);
+
+  if (!NILP (Ffile_directory_p (linkname)))
+    linkname = Fexpand_file_name (Ffile_name_nondirectory (filename), linkname);
+  else
+    linkname = Fexpand_file_name (linkname, Qnil);
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */
@@ -4505,12 +4517,12 @@ actually used.  */)
              this way, we can run Lisp program safely before decoding
              the inserted text.  */
           Lisp_Object unwind_data;
-              int count = SPECPDL_INDEX ();
+          int count = SPECPDL_INDEX ();
 
           unwind_data = Fcons (current_buffer->enable_multibyte_characters,
                                Fcons (current_buffer->undo_list,
                                       Fcurrent_buffer ()));
-              current_buffer->enable_multibyte_characters = Qnil;
+          current_buffer->enable_multibyte_characters = Qnil;
           current_buffer->undo_list = Qt;
           record_unwind_protect (decide_coding_unwind, unwind_data);
 
@@ -4532,7 +4544,6 @@ actually used.  */)
               if (CONSP (coding_systems))
                 val = XCAR (coding_systems);
             }
-
           unbind_to (count, Qnil);
           inserted = Z_BYTE - BEG_BYTE;
         }
@@ -4543,7 +4554,7 @@ actually used.  */)
          on some system.  */
       {
         struct coding_system temp_coding;
-        setup_coding_system (val, &temp_coding);
+        setup_coding_system (Fcheck_coding_system (val), &temp_coding);
         bcopy (&temp_coding, &coding, sizeof coding);
       }
       /* Ensure we set Vlast_coding_system_used.  */
diff --git a/src/fontset.c b/src/fontset.c
index 7dff29f3ed8..c427b22e379 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -765,6 +765,23 @@ fs_load_font (f, c, fontname, id, face)
 #pragma optimize("", on)
 #endif
 
+/* Set the ASCII font of the default fontset to FONTNAME if that is
+   not yet set.  */
+void
+set_default_ascii_font (fontname)
+     Lisp_Object fontname;
+{
+  if (! CONSP (FONTSET_ASCII (Vdefault_fontset)))
+    {
+      int id = fs_query_fontset (fontname, 2);
+
+      if (id >= 0)
+        fontname = XCDR (FONTSET_ASCII (FONTSET_FROM_ID (id)));
+      FONTSET_ASCII (Vdefault_fontset)
+        = Fcons (make_number (0), fontname);
+    }
+}
+
 
 /* Cache data used by fontset_pattern_regexp.  The car part is a
    pattern string containing at least one wild card, the cdr part is
@@ -1628,19 +1645,6 @@ syms_of_fontset ()
   FONTSET_ID (Vdefault_fontset) = make_number (0);
   FONTSET_NAME (Vdefault_fontset)
     = build_string ("-*-*-*-*-*-*-*-*-*-*-*-*-fontset-default");
-#if defined (MAC_OS)
-  FONTSET_ASCII (Vdefault_fontset)
-    = Fcons (make_number (0),
-             build_string ("-apple-monaco-medium-r-*--*-120-*-*-*-*-mac-roman"));
-#elif defined (WINDOWSNT)
-  FONTSET_ASCII (Vdefault_fontset)
-    = Fcons (make_number (0),
-             build_string ("-*-courier new-normal-r-*-*-*-100-*-*-*-*-iso8859-1"));
-#else
-  FONTSET_ASCII (Vdefault_fontset)
-    = Fcons (make_number (0),
-             build_string ("-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"));
-#endif
   AREF (Vfontset_table, 0) = Vdefault_fontset;
   next_fontset_id = 1;
 
diff --git a/src/fontset.h b/src/fontset.h
index c0f0f2d22e4..eee5e515b98 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -194,6 +194,7 @@ extern Lisp_Object fontset_font_pattern P_ ((FRAME_PTR, int, int));
 extern int face_suitable_for_char_p P_ ((struct face *, int));
 extern int face_for_char P_ ((FRAME_PTR, struct face *, int));
 extern int make_fontset_for_ascii_face P_ ((FRAME_PTR, int));
+extern void set_default_ascii_font P_ ((Lisp_Object));
 extern struct font_info *fs_load_font P_ ((struct frame *, int, char *, int,
                                            struct face *));
 extern int fs_query_fontset P_ ((Lisp_Object, int));
diff --git a/src/frame.c b/src/frame.c
index 06ffc04f2d1..375b1a20a9d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3321,6 +3321,7 @@ x_set_font (f, arg, oldval)
     error ("The characters of the given font have varying widths");
   else if (STRINGP (result))
     {
+      set_default_ascii_font (result);
       if (STRINGP (fontset_name))
         {
           /* Fontset names are built from ASCII font names, so the
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6dcba3036c0..8bd83e40043 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2999,9 +2999,14 @@ xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height)
       GtkWidget *wparent = gtk_widget_get_parent (wscroll);
 
       /* Move and resize to new values.  */
-      gtk_widget_set_size_request (wscroll, width, height);
       gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top);
-
+      gtk_widget_set_size_request (wscroll, width, height);
+      gtk_widget_queue_draw (wparent);
+      gdk_window_process_all_updates ();
+      /* GTK does not redraw until the main loop is entered again, but
+         if there are no X events pending we will not enter it.  So we sync
+         here to get some events.  */
+      x_sync (f);
       SET_FRAME_GARBAGED (f);
       cancel_mouse_face (f);
     }
diff --git a/src/keyboard.c b/src/keyboard.c
index 3fa6240381e..fcc35cb1235 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1335,6 +1335,11 @@ DEFUN ("top-level", Ftop_level, Stop_level, 0, 0, "",
     cancel_hourglass ();
 #endif
 
+  /* Unblock input if we enter with input blocked.  This may happen if
+     redisplay traps e.g. during tool-bar update with input blocked.  */
+  while (INPUT_BLOCKED_P)
+    UNBLOCK_INPUT;
+
   return Fthrow (Qtop_level, Qnil);
 }
 
@@ -9780,6 +9785,15 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
   Lisp_Object saved_keys, saved_last_point_position_buffer;
   Lisp_Object bindings, value;
   struct gcpro gcpro1, gcpro2, gcpro3;
+#ifdef HAVE_X_WINDOWS
+  /* The call to Fcompleting_read wil start and cancel the hourglass,
+     but if the hourglass was already scheduled, this means that no
+     hourglass will be shown for the actual M-x command itself.
+     So we restart it if it is already scheduled.  Note that checking
+     hourglass_shown_p is not enough,  normally the hourglass is not shown,
+     just scheduled to be shown.  */
+  int hstarted = hourglass_started ();
+#endif
 
   saved_keys = Fvector (this_command_key_count,
                         XVECTOR (this_command_keys)->contents);
@@ -9811,6 +9825,10 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
                                Qt, Qnil, Qextended_command_history, Qnil,
                                Qnil);
 
+#ifdef HAVE_X_WINDOWS
+  if (hstarted) start_hourglass ();
+#endif
+
   if (STRINGP (function) && SCHARS (function) == 0)
     error ("No command name given");
 
diff --git a/src/macterm.c b/src/macterm.c
index a98d4ae5eb4..a6039dbf5c6 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -8451,19 +8451,23 @@ main (void)
 #endif
 
 /* Table for translating Mac keycode to X keysym values.  Contributed
-   by Sudhir Shenoy.  */
+   by Sudhir Shenoy.
+   Mapping for special keys is now identical to that in Apple X11
+   except `clear' (-> <clear>) on the KeyPad, `enter' (-> <kp-enter>)
+   on the right of the Cmd key on laptops, and fn + `enter' (->
+   <linefeed>). */
 static unsigned char 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, 0x0d /*return*/, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 
   /*0x30*/ 0x09 /*tab*/, 0 /*0x0020 space*/, 0, 0x08 /*backspace*/,
-  /*0x34*/ 0, 0x1b /*escape*/, 0, 0,
+  /*0x34*/ 0x8d /*enter on laptops*/, 0x1b /*escape*/, 0, 0,
   /*0x38*/ 0, 0, 0, 0,
   /*0x3C*/ 0, 0, 0, 0,
 
   /*0x40*/ 0, 0xae /*kp-.*/, 0, 0xaa /*kp-**/,
-  /*0x44*/ 0, 0xab /*kp-+*/, 0, 0x7f /*kp-clear*/,
+  /*0x44*/ 0, 0xab /*kp-+*/, 0, 0x0b /*clear*/,
   /*0x48*/ 0, 0, 0, 0xaf /*kp-/*/,
   /*0x4C*/ 0x8d /*kp-enter*/, 0, 0xad /*kp--*/, 0,
 
@@ -8475,11 +8479,11 @@ static unsigned char keycode_to_xkeysym_table[] = {
   /*0x60*/ 0xc2 /*f5*/, 0xc3 /*f6*/, 0xc4 /*f7*/, 0xc0 /*f3*/,
   /*0x64*/ 0xc5 /*f8*/, 0xc6 /*f9*/, 0, 0xc8 /*f11*/,
   /*0x68*/ 0, 0xca /*f13*/, 0, 0xcb /*f14*/,
-  /*0x6C*/ 0, 0xc7 /*f10*/, 0, 0xc9 /*f12*/,
+  /*0x6C*/ 0, 0xc7 /*f10*/, 0x0a /*fn+enter on laptops*/, 0xc9 /*f12*/,
 
-  /*0x70*/ 0, 0xcc /*f15*/, 0x9e /*insert (or 0x6a==help)*/, 0x95 /*home*/,
-  /*0x74*/ 0x9a /*pgup*/, 0x9f /*delete*/, 0xc1 /*f4*/, 0x9c /*end*/,
-  /*0x78*/ 0xbf /*f2*/, 0x9b /*pgdown*/, 0xbe /*f1*/, 0x51 /*left*/,
+  /*0x70*/ 0, 0xcc /*f15*/, 0x6a /*help*/, 0x50 /*home*/,
+  /*0x74*/ 0x55 /*pgup*/, 0xff /*delete*/, 0xc1 /*f4*/, 0x57 /*end*/,
+  /*0x78*/ 0xbf /*f2*/, 0x56 /*pgdown*/, 0xbe /*f1*/, 0x51 /*left*/,
   /*0x7C*/ 0x53 /*right*/, 0x54 /*down*/, 0x52 /*up*/, 0
 };
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 7f7e60e81b8..b08029b5b7f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1294,6 +1294,7 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
   /* Note that we may overshoot because of invisible text.  */
   if (IT_CHARPOS (it) >= charpos)
     {
+      int top_x = it.current_x;
       int top_y = it.current_y;
       int bottom_y = (last_height = 0, line_bottom_y (&it));
       int window_top_y = WINDOW_HEADER_LINE_HEIGHT (w);
@@ -1302,15 +1303,12 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
         visible_p = bottom_y > window_top_y;
       else if (top_y < it.last_visible_y)
           visible_p = 1;
-      if (visible_p && x)
+      if (visible_p)
         {
-          *x = it.current_x;
+          *x = top_x;
           *y = max (top_y + max (0, it.max_ascent - it.ascent), window_top_y);
-          if (rtop)
-            {
-              *rtop = max (0, window_top_y - top_y);
-              *rbot = max (0, bottom_y - it.last_visible_y);
-            }
+          *rtop = max (0, window_top_y - top_y);
+          *rbot = max (0, bottom_y - it.last_visible_y);
         }
     }
   else
@@ -1323,18 +1321,12 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
       if (charpos < IT_CHARPOS (it))
         {
           visible_p = 1;
-          if (x)
-            {
-              move_it_to (&it2, charpos, -1, -1, -1, MOVE_TO_POS);
-              *x = it2.current_x;
-              *y = it2.current_y + it2.max_ascent - it2.ascent;
-              if (rtop)
-                {
-                  *rtop = max (0, -it2.current_y);
-                  *rbot = max (0, ((it2.current_y + it2.max_ascent + it2.max_descent)
-                                   - it.last_visible_y));
-                }
-            }
+          move_it_to (&it2, charpos, -1, -1, -1, MOVE_TO_POS);
+          *x = it2.current_x;
+          *y = it2.current_y + it2.max_ascent - it2.ascent;
+          *rtop = max (0, -it2.current_y);
+          *rbot = max (0, ((it2.current_y + it2.max_ascent + it2.max_descent)
+                           - it.last_visible_y));
         }
     }
 
diff --git a/src/xfns.c b/src/xfns.c
index db2e3f74045..4c9b38d2556 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1969,6 +1969,88 @@ static XIMStyle supported_xim_styles[] =
 
 /* Create an X fontset on frame F with base font name BASE_FONTNAME.  */
 
+char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
+
+char *
+xic_create_fontsetname (base_fontname)
+     char *base_fontname;
+{
+  /* Make a fontset name from the base font name.  */
+  if (xic_defaut_fontset == base_fontname)
+    /* There is no base font name, use the default.  */
+    return base_fontname;
+  else
+    {
+      /* Make a fontset name from the base font name.
+         The font set will be made of the following elements:
+         - the base font.
+         - the base font where the charset spec is replaced by -*-*.
+         - the same but with the family also replaced with -*-*-.  */
+      char *p = base_fontname;
+      char *fontsetname;
+      int i;
+        
+      for (i = 0; *p; p++)
+        if (*p == '-') i++;
+      if (i != 14)
+        { /* As the font name doesn't conform to XLFD, we can't
+             modify it to generalize it to allcs and allfamilies.
+             Use the specified font plus the default.  */
+          int len = strlen (base_fontname) + strlen (xic_defaut_fontset) + 2;
+          fontsetname = xmalloc (len);
+          bzero (fontsetname, len);
+          strcpy (fontsetname, base_fontname);
+          strcat (fontsetname, ",");
+          strcat (fontsetname, xic_defaut_fontset);
+        }
+      else
+        {
+          int len;
+          char *p1 = NULL;
+          char *font_allcs = NULL;
+          char *font_allfamilies = NULL;
+          char *allcs = "*-*-*-*-*-*-*";
+          char *allfamilies = "-*-*-";
+          
+          for (i = 0, p = base_fontname; i < 8; p++)
+            {
+              if (*p == '-')
+                {
+                  i++;
+                  if (i == 3)
+                    p1 = p + 1;
+                }
+            }
+          /* Build the font spec that matches all charsets.  */
+          len = p - base_fontname + strlen (allcs) + 1;
+          font_allcs = (char *) alloca (len);
+          bzero (font_allcs, len);
+          bcopy (base_fontname, font_allcs, p - base_fontname);
+          strcat (font_allcs, allcs);
+
+          /* Build the font spec that matches all families.  */
+          len = p - p1 + strlen (allcs) + strlen (allfamilies) + 1;
+          font_allfamilies = (char *) alloca (len);
+          bzero (font_allfamilies, len);
+          strcpy (font_allfamilies, allfamilies);
+          bcopy (p1, font_allfamilies + (strlen (allfamilies)), p - p1);
+          strcat (font_allfamilies, allcs);
+
+          /* Build the actual font set name.  */
+          len = strlen (base_fontname) + strlen (font_allcs)
+            + strlen (font_allfamilies) + 3;
+          fontsetname = xmalloc (len);
+          bzero (fontsetname, len);
+          strcpy (fontsetname, base_fontname);
+          strcat (fontsetname, ",");
+          strcat (fontsetname, font_allcs);
+          strcat (fontsetname, ",");
+          strcat (fontsetname, font_allfamilies);
+        }
+      return fontsetname;
+    }
+}
+
 static XFontSet
 xic_create_xfontset (f, base_fontname)
      struct frame *f;
@@ -1980,6 +2062,9 @@ xic_create_xfontset (f, base_fontname)
   char *def_string;
   Lisp_Object rest, frame;
 
+  if (!base_fontname)
+    base_fontname = xic_defaut_fontset;
+
   /* See if there is another frame already using same fontset.  */
   FOR_EACH_FRAME (rest, frame)
     {
@@ -1996,12 +2081,16 @@ xic_create_xfontset (f, base_fontname)
 
   if (!xfs)
     {
+      char *fontsetname = xic_create_fontsetname (base_fontname);
+
       /* New fontset.  */
       xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
-                            base_fontname, &missing_list,
+                            fontsetname, &missing_list,
                             &missing_count, &def_string);
       if (missing_list)
         XFreeStringList (missing_list);
+      if (fontsetname != base_fontname)
+        xfree (fontsetname);
     }
 
   if (FRAME_XIC_BASE_FONTNAME (f))
@@ -2083,6 +2172,11 @@ create_frame_xic (f)
   if (FRAME_XIC (f))
     return;
 
+  /* Create X fontset. */
+  xfs = xic_create_xfontset
+    (f, (FRAME_FONTSET (f) < 0) ? NULL
+        : (char *) SDATA (fontset_ascii (FRAME_FONTSET (f))));
+
   xim = FRAME_X_XIM (f);
   if (xim)
     {
@@ -2090,52 +2184,9 @@ create_frame_xic (f)
       XPoint spot;
       XVaNestedList preedit_attr;
       XVaNestedList status_attr;
-      char *base_fontname;
-      int fontset;
 
       s_area.x = 0; s_area.y = 0; s_area.width = 1; s_area.height = 1;
       spot.x = 0; spot.y = 1;
-      /* Create X fontset. */
-      fontset = FRAME_FONTSET (f);
-      if (fontset < 0)
-        base_fontname = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
-      else
-        {
-          /* Determine the base fontname from the ASCII font name of
-             FONTSET.  */
-          char *ascii_font = (char *) SDATA (fontset_ascii (fontset));
-          char *p = ascii_font;
-          int i;
-
-          for (i = 0; *p; p++)
-            if (*p == '-') i++;
-          if (i != 14)
-            /* As the font name doesn't conform to XLFD, we can't
-               modify it to get a suitable base fontname for the
-               frame.  */
-            base_fontname = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
-          else
-            {
-              int len = strlen (ascii_font) + 1;
-              char *p1 = NULL;
-
-              for (i = 0, p = ascii_font; i < 8; p++)
-                {
-                  if (*p == '-')
-                    {
-                      i++;
-                      if (i == 3)
-                        p1 = p + 1;
-                    }
-                }
-              base_fontname = (char *) alloca (len);
-              bzero (base_fontname, len);
-              strcpy (base_fontname, "-*-*-");
-              bcopy (p1, base_fontname + 5, p - p1);
-              strcat (base_fontname, "*-*-*-*-*-*-*");
-            }
-        }
-      xfs = xic_create_xfontset (f, base_fontname);
 
       /* Determine XIC style.  */
       if (xic_style == 0)
@@ -4310,6 +4361,14 @@ static Lisp_Object Vhourglass_delay;
 static void show_hourglass P_ ((struct atimer *));
 static void hide_hourglass P_ ((void));
 
+/* Return non-zero if houglass timer has been started or hourglass is shown.  */
+
+int
+hourglass_started ()
+{
+  return hourglass_shown_p || hourglass_atimer != NULL;
+}
+
 
 /* Cancel a currently active hourglass timer, and start a new one.  */
 
diff --git a/src/xmenu.c b/src/xmenu.c
index b6a5186f1f1..41c1c2fe078 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
-   Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2003, 2004,
+   2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -138,12 +138,7 @@ static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
 /* gtk just uses utf-8.  */
 # define ENCODE_MENU_STRING(str) ENCODE_UTF_8 (str)
 #else
-/* I'm not convinced ENCODE_SYSTEM is defined correctly, or maybe
-   something else should be used here.  Except under MS-Windows it
-   just converts to unibyte, but encoding with `locale-coding-system'
-   seems better -- X may actually display the result correctly, and
-   it's not necessarily equivalent to the unibyte text.  -- fx  */
-# define ENCODE_MENU_STRING(str) ENCODE_SYSTEM (str)
+# define ENCODE_MENU_STRING(str) string_make_unibyte (str)
 #endif
 
 static void push_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
@@ -645,10 +640,10 @@ list_of_panes (menu)
 
   init_menu_items ();
 
-  for (tail = menu; !NILP (tail); tail = Fcdr (tail))
+  for (tail = menu; CONSP (tail); tail = XCDR (tail))
     {
       Lisp_Object elt, pane_name, pane_data;
-      elt = Fcar (tail);
+      elt = XCAR (tail);
       pane_name = Fcar (elt);
       CHECK_STRING (pane_name);
       push_menu_pane (ENCODE_MENU_STRING (pane_name), Qnil);
@@ -668,22 +663,22 @@ list_of_items (pane)
 {
   Lisp_Object tail, item, item1;
 
-  for (tail = pane; !NILP (tail); tail = Fcdr (tail))
+  for (tail = pane; CONSP (tail); tail = XCDR (tail))
     {
-      item = Fcar (tail);
+      item = XCAR (tail);
       if (STRINGP (item))
         push_menu_item (ENCODE_MENU_STRING (item), Qnil, Qnil, Qt,
                         Qnil, Qnil, Qnil, Qnil);
-      else if (NILP (item))
-        push_left_right_boundary ();
-      else
+      else if (CONSP (item))
         {
-          CHECK_CONS (item);
-          item1 = Fcar (item);
+          item1 = XCAR (item);
           CHECK_STRING (item1);
-          push_menu_item (ENCODE_MENU_STRING (item1), Qt, Fcdr (item),
+          push_menu_item (ENCODE_MENU_STRING (item1), Qt, XCDR (item),
                           Qt, Qnil, Qnil, Qnil, Qnil);
         }
+      else
+        push_left_right_boundary ();
+
     }
 }
 
@@ -802,8 +797,8 @@ cached information about equivalent key sequences.  */)
           if (CONSP (tem))
             {
               window = Fcar (Fcdr (position));
-              x = Fcar (tem);
-              y = Fcar (Fcdr (tem));
+              x = XCAR (tem);
+              y = Fcar (XCDR (tem));
             }
           else
             {
@@ -931,11 +926,11 @@ cached information about equivalent key sequences.  */)
 
       /* The first keymap that has a prompt string
          supplies the menu title.  */
-      for (tem = menu, i = 0; CONSP (tem); tem = Fcdr (tem))
+      for (tem = menu, i = 0; CONSP (tem); tem = XCDR (tem))
         {
           Lisp_Object prompt;
 
-          maps[i++] = keymap = get_keymap (Fcar (tem), 1, 0);
+          maps[i++] = keymap = get_keymap (XCAR (tem), 1, 0);
 
           prompt = Fkeymap_prompt (keymap);
           if (NILP (title) && !NILP (prompt))
@@ -1750,7 +1745,7 @@ digest_single_submenu (start, end, top_level_items)
 #ifndef HAVE_MULTILINGUAL_MENU
           if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
             {
-              pane_name = ENCODE_SYSTEM (pane_name);
+              pane_name = ENCODE_MENU_STRING (pane_name);
               AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name;
             }
 #endif
@@ -2695,7 +2690,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
 #ifndef HAVE_MULTILINGUAL_MENU
           if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
             {
-              pane_name = ENCODE_SYSTEM (pane_name);
+              pane_name = ENCODE_MENU_STRING (pane_name);
               AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name;
             }
 #endif