1 files changed, 6 insertions, 6 deletions
diff --git a/src/coding.h b/src/coding.h
index 5fa42643ca0..dc4d8c540c7 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -493,10 +493,10 @@ struct coding_system
 #define ENCODE_FILE(name)                                                  \
  (! NILP (Vfile_name_coding_system)                                       \
   && XFASTINT (Vfile_name_coding_system) != 0                             \
-   ? Fencode_coding_string (name, Vfile_name_coding_system, Qt)            \
+   ? code_convert_string_norecord (name, Vfile_name_coding_system, 1)      \
   : (! NILP (Vdefault_file_name_coding_system)                            \
-      && XFASTINT (Vdefault_file_name_coding_system)                       \
+      && XFASTINT (Vdefault_file_name_coding_system) != 0                  \
-      ? Fencode_coding_string (name, Vdefault_file_name_coding_system, Qt) \
+      ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 1) \
      : name))
 /* Decode the file name NAME using the specified coding system
@@ -504,10 +504,10 @@ struct coding_system
 #define DECODE_FILE(name)                                                  \
  (! NILP (Vfile_name_coding_system)                                       \
   && XFASTINT (Vfile_name_coding_system) != 0                             \
-   ? Fdecode_coding_string (name, Vfile_name_coding_system, Qt)            \
+   ? code_convert_string_norecord (name, Vfile_name_coding_system, 0)      \
   : (! NILP (Vdefault_file_name_coding_system)                            \
-      && XFASTINT (Vdefault_file_name_coding_system)                       \
+      && XFASTINT (Vdefault_file_name_coding_system) != 0                  \
-      ? Fdecode_coding_string (name, Vdefault_file_name_coding_system, Qt) \
+      ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 0) \
      : name))
 /* Extern declarations.  */

diff --git a/src/coding.h b/src/coding.h index 5fa42643ca0..dc4d8c540c7 100644 --- a/src/coding.h +++ b/src/coding.h
@@ -493,10 +493,10 @@ struct coding_system
493	#define ENCODE_FILE(name) \	493	#define ENCODE_FILE(name) \
494	(! NILP (Vfile_name_coding_system) \	494	(! NILP (Vfile_name_coding_system) \
495	&& XFASTINT (Vfile_name_coding_system) != 0 \	495	&& XFASTINT (Vfile_name_coding_system) != 0 \
496	? Fencode_coding_string (name, Vfile_name_coding_system, Qt) \	496	? code_convert_string_norecord (name, Vfile_name_coding_system, 1) \
497	: (! NILP (Vdefault_file_name_coding_system) \	497	: (! NILP (Vdefault_file_name_coding_system) \
498	&& XFASTINT (Vdefault_file_name_coding_system) \	498	&& XFASTINT (Vdefault_file_name_coding_system) != 0 \
499	? Fencode_coding_string (name, Vdefault_file_name_coding_system, Qt) \	499	? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 1) \
500	: name))	500	: name))
501		501
502	/* Decode the file name NAME using the specified coding system	502	/* Decode the file name NAME using the specified coding system
@@ -504,10 +504,10 @@ struct coding_system
504	#define DECODE_FILE(name) \	504	#define DECODE_FILE(name) \
505	(! NILP (Vfile_name_coding_system) \	505	(! NILP (Vfile_name_coding_system) \
506	&& XFASTINT (Vfile_name_coding_system) != 0 \	506	&& XFASTINT (Vfile_name_coding_system) != 0 \
507	? Fdecode_coding_string (name, Vfile_name_coding_system, Qt) \	507	? code_convert_string_norecord (name, Vfile_name_coding_system, 0) \
508	: (! NILP (Vdefault_file_name_coding_system) \	508	: (! NILP (Vdefault_file_name_coding_system) \
509	&& XFASTINT (Vdefault_file_name_coding_system) \	509	&& XFASTINT (Vdefault_file_name_coding_system) != 0 \
510	? Fdecode_coding_string (name, Vdefault_file_name_coding_system, Qt) \	510	? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 0) \
511	: name))	511	: name))
512		512
513	/* Extern declarations. */	513	/* Extern declarations. */