[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fileio.c
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/fileio.c |
Date: |
Tue, 13 Sep 2005 22:15:35 -0400 |
Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.553 emacs/src/fileio.c:1.554
*** emacs/src/fileio.c:1.553 Mon Sep 12 13:42:49 2005
--- emacs/src/fileio.c Wed Sep 14 02:15:34 2005
***************
*** 1056,1061 ****
--- 1056,1062 ----
#endif /* DOS_NT */
int length;
Lisp_Object handler, result;
+ int multibyte;
CHECK_STRING (name);
***************
*** 1133,1138 ****
--- 1134,1140 ----
name = FILE_SYSTEM_CASE (name);
nm = SDATA (name);
+ multibyte = STRING_MULTIBYTE (name);
#ifdef DOS_NT
/* We will force directory separators to be either all \ or /, so make
***************
*** 1298,1305 ****
if (index (nm, '/'))
{
nm = sys_translate_unix (nm);
! return make_specified_string (nm, -1, strlen (nm),
! STRING_MULTIBYTE (name));
}
#endif /* VMS */
#ifdef DOS_NT
--- 1300,1306 ----
if (index (nm, '/'))
{
nm = sys_translate_unix (nm);
! return make_specified_string (nm, -1, strlen (nm), multibyte);
}
#endif /* VMS */
#ifdef DOS_NT
***************
*** 1311,1318 ****
if (IS_DIRECTORY_SEP (nm[1]))
{
if (strcmp (nm, SDATA (name)) != 0)
! name = make_specified_string (nm, -1, strlen (nm),
! STRING_MULTIBYTE (name));
}
else
#endif
--- 1312,1318 ----
if (IS_DIRECTORY_SEP (nm[1]))
{
if (strcmp (nm, SDATA (name)) != 0)
! name = make_specified_string (nm, -1, strlen (nm), multibyte);
}
else
#endif
***************
*** 1321,1328 ****
{
char temp[] = " :";
! name = make_specified_string (nm, -1, p - nm,
! STRING_MULTIBYTE (name));
temp[0] = DRIVE_LETTER (drive);
name = concat2 (build_string (temp), name);
}
--- 1321,1327 ----
{
char temp[] = " :";
! name = make_specified_string (nm, -1, p - nm, multibyte);
temp[0] = DRIVE_LETTER (drive);
name = concat2 (build_string (temp), name);
}
***************
*** 1330,1337 ****
#else /* not DOS_NT */
if (nm == SDATA (name))
return name;
! return make_specified_string (nm, -1, strlen (nm),
! STRING_MULTIBYTE (name));
#endif /* not DOS_NT */
}
}
--- 1329,1335 ----
#else /* not DOS_NT */
if (nm == SDATA (name))
return name;
! return make_specified_string (nm, -1, strlen (nm), multibyte);
#endif /* not DOS_NT */
}
}
***************
*** 1443,1448 ****
--- 1441,1447 ----
&& !newdir)
{
newdir = SDATA (default_directory);
+ multibyte |= STRING_MULTIBYTE (default_directory);
#ifdef DOS_NT
/* Note if special escape prefix is present, but remove for now. */
if (newdir[0] == '/' && newdir[1] == ':')
***************
*** 1708,1715 ****
CORRECT_DIR_SEPS (target);
#endif /* DOS_NT */
! result = make_specified_string (target, -1, o - target,
! STRING_MULTIBYTE (name));
/* Again look to see if the file name has special constructs in it
and perhaps call the corresponding file handler. This is needed
--- 1707,1713 ----
CORRECT_DIR_SEPS (target);
#endif /* DOS_NT */
! result = make_specified_string (target, -1, o - target, multibyte);
/* Again look to see if the file name has special constructs in it
and perhaps call the corresponding file handler. This is needed