4 files changed, 169 insertions, 87 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 24db3a9c55a..b09d6ccdad9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+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.
@@ -20,8 +49,7 @@
         available font is found.
 
         * fontset.c (set_default_ascii_font): New function.
-        (syms_of_fontset): Don't set FONTSET_ASCII (Vdefault_fontset)
-        here.
+        (syms_of_fontset): Don't set FONTSET_ASCII (Vdefault_fontset) here.
 
         * fontset.h (set_default_ascii_font): Extern it.
 
@@ -82,13 +110,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.
@@ -96,16 +122,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.
@@ -118,12 +143,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/fileio.c b/src/fileio.c
index db511aad887..c62c1e88042 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.
 
@@ -2696,7 +2696,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.  */
@@ -2779,7 +2783,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.  */
@@ -2846,7 +2854,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.  */
@@ -4508,7 +4520,6 @@ actually used.  */)
               if (CONSP (coding_system))
                 coding_system = XCAR (coding_system);
             }
-
           unbind_to (count, Qnil);
           inserted = Z_BYTE - BEG_BYTE;
         }
diff --git a/src/xfns.c b/src/xfns.c
index c45845e00ce..0522fc4137e 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1939,6 +1939,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;
@@ -1950,6 +2032,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)
     {
@@ -1966,12 +2051,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))
@@ -2053,6 +2142,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)
     {
@@ -2060,52 +2154,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)
diff --git a/src/xmenu.c b/src/xmenu.c
index e98ee7534a4..07d6fe3d730 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