summaryrefslogtreecommitdiff
path: root/src/fileio.c
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-12-15 22:39:36 +0200
committerEli Zaretskii <eliz@gnu.org>2013-12-15 22:39:36 +0200
commitdb50ad5f11cc5809c27091181a13ee7aa34ec5ed (patch)
treed6a471d3c654361bd1ad399a0c3fd0821e28559d /src/fileio.c
parent1014b1dc34ed9717c48a089f45423235f09b1101 (diff)
downloademacs-db50ad5f11cc5809c27091181a13ee7aa34ec5ed.tar.gz
emacs-db50ad5f11cc5809c27091181a13ee7aa34ec5ed.tar.bz2
emacs-db50ad5f11cc5809c27091181a13ee7aa34ec5ed.zip
Fix bug with conditionals in expand-file-name on MS-Windows.
src/fileio.c (Fexpand_file_name) [WINDOWSNT]: Fix conditionals. Reported by Juanma Barranquero <lekktu@gmail.com>.
Diffstat (limited to 'src/fileio.c')
-rw-r--r--src/fileio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 02bde865644..47736d2b1b7 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1168,9 +1168,8 @@ filesystem tree, not (expand-file-name ".." dirname). */)
tem = build_string (newdir_utf8);
}
else
-#else
- tem = build_string (newdir);
#endif
+ tem = build_string (newdir);
if (multibyte && !STRING_MULTIBYTE (tem))
{
hdir = DECODE_FILE (tem);