--- a/src/editfns.c	Mon Aug 13 11:32:27 2007 +0200
+++ b/src/editfns.c	Mon Aug 13 11:33:38 2007 +0200
@@ -96,7 +96,7 @@
   if ((p = getenv ("NAME")))
     /* I don't think it's the right thing to do the ampersand
        modification on NAME.  Not that it matters anymore...  -hniksic */
-    Vuser_full_name = build_ext_string (p, FORMAT_OS);
+    Vuser_full_name = build_ext_string (p, Qnative);
   else
     Vuser_full_name = Fuser_full_name (Qnil);
 }
@@ -131,7 +131,7 @@
 */
        (str))
 {
-  struct Lisp_String *p;
+  Lisp_String *p;
   CHECK_STRING (str);
 
   p = XSTRING (str);
@@ -625,7 +625,7 @@
    tmpdir = "/tmp";
 #endif
 
-  return build_ext_string (tmpdir, FORMAT_FILENAME);
+  return build_ext_string (tmpdir, Qfile_name);
 }
 
 DEFUN ("user-login-name", Fuser_login_name, 0, 1, 0, /*
@@ -768,7 +768,9 @@
 
       /* Fuck me.  getpwnam() can call select() and (under IRIX at least)
 	 things get wedged if a SIGIO arrives during this time. */
-      GET_C_STRING_OS_DATA_ALLOCA (user_name, user_name_ext);
+      TO_EXTERNAL_FORMAT (LISP_STRING, user_name,
+			  C_STRING_ALLOCA, user_name_ext,
+			  Qnative);
       slow_down_interrupts ();
       pw = (struct passwd *) getpwnam (user_name_ext);
       speed_up_interrupts ();
@@ -786,7 +788,7 @@
   tem = ((!NILP (user) && !pw)
 	 ? Qnil
 	 : make_ext_string ((Extbyte *) p, (q ? q - p : strlen (p)),
-			    FORMAT_OS));
+			    Qnative));
 
 #ifdef AMPERSAND_FULL_NAME
   if (!NILP (tem))
@@ -811,7 +813,7 @@
   return tem;
 }
 
-static char *cached_home_directory;
+static Extbyte *cached_home_directory;
 
 void
 uncache_home_directory (void)
@@ -821,24 +823,27 @@
 }
 
 /* Returns the home directory, in external format */
-char *
+Extbyte *
 get_home_directory (void)
 {
   int output_home_warning = 0;
 
   if (cached_home_directory == NULL)
     {
-      if ((cached_home_directory = getenv("HOME")) == NULL)
+      if ((cached_home_directory = (Extbyte *) getenv("HOME")) == NULL)
 	{
 #if defined(WINDOWSNT) && !defined(__CYGWIN32__)
-	  char	*homedrive, *homepath;
+	  char *homedrive, *homepath;
 
 	  if ((homedrive = getenv("HOMEDRIVE")) != NULL &&
 	      (homepath = getenv("HOMEPATH")) != NULL)
 	    {
 	      cached_home_directory =
-		(char *) xmalloc(strlen(homedrive) + strlen(homepath) + 1);
-	      sprintf(cached_home_directory, "%s%s", homedrive, homepath);
+		(Extbyte *) xmalloc (strlen (homedrive) +
+				     strlen (homepath) + 1);
+	      sprintf((char *) cached_home_directory, "%s%s",
+		      homedrive,
+		      homepath);
 	    }
 	  else
 	    {
@@ -861,7 +866,7 @@
 	      /*
 	       * This is NT Emacs behavior
 	       */
-	      cached_home_directory = "C:\\";
+	      cached_home_directory = (Extbyte *) "C:\\";
 	      output_home_warning = 1;
 # endif
 	    }
@@ -872,7 +877,7 @@
 	   * We probably should try to extract pw_dir from /etc/passwd,
 	   * before falling back to this.
 	   */
-	  cached_home_directory = "/";
+	  cached_home_directory = (Extbyte *) "/";
 	  output_home_warning = 1;
 #endif	/* !WINDOWSNT */
 	}
@@ -895,11 +900,11 @@
 */
        ())
 {
-  char *path = get_home_directory ();
+  Extbyte *path = get_home_directory ();
 
   return path == NULL ? Qnil :
     Fexpand_file_name (Fsubstitute_in_file_name
-		       (build_ext_string (path, FORMAT_FILENAME)),
+		       (build_ext_string ((char *) path, Qfile_name)),
 		       Qnil);
 }
 
@@ -1071,7 +1076,7 @@
 			  (CONST char *) XSTRING_DATA (format_string),
 			  localtime (&value))
 	  || !*buf)
-	return build_ext_string (buf, FORMAT_BINARY);
+	return build_ext_string (buf, Qbinary);
       /* If buffer was too small, make it bigger.  */
       size *= 2;
     }
@@ -1225,7 +1230,7 @@
   strncpy (buf, tem, 24);
   buf[24] = 0;
 
-  return build_ext_string (buf, FORMAT_BINARY);
+  return build_ext_string (buf, Qbinary);
 }
 
 #define TM_YEAR_ORIGIN 1900
@@ -1819,7 +1824,7 @@
   mc_count = begin_multiple_change (buf, pos, stop);
   if (STRINGP (table))
     {
-      struct Lisp_String *stable = XSTRING (table);
+      Lisp_String *stable = XSTRING (table);
       Charcount size = string_char_length (stable);
 #ifdef MULE
       /* Under Mule, string_char(n) is O(n), so for large tables or
@@ -1899,7 +1904,7 @@
 	   && (XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_GENERIC
 	       || XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_CHAR))
     {
-      struct Lisp_Char_Table *ctable = XCHAR_TABLE (table);
+      Lisp_Char_Table *ctable = XCHAR_TABLE (table);
 
       for (; pos < stop && (oc = BUF_FETCH_CHAR (buf, pos), 1); pos++)
 	{