summaryrefslogtreecommitdiff
path: root/src/coding.h
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-10-26 13:37:43 +0300
committerEli Zaretskii <eliz@gnu.org>2013-10-26 13:37:43 +0300
commitc3e9160b8c375760d6bc53602caeed211e91389d (patch)
tree94322287584b1c8a245a78caca63df5b16461a68 /src/coding.h
parent03d58cca817e8a21414c84696387813687c75261 (diff)
Finished conversion routines; w32-unicode-filenames exposed to Lisp.
Diffstat (limited to 'src/coding.h')
-rw-r--r--src/coding.h18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/coding.h b/src/coding.h
index 0472bec99d..39f9d62462 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -672,23 +672,11 @@ struct coding_system
/* Encode the file name NAME using the specified coding system
for file names, if any. */
-#define ENCODE_FILE(name) \
- (! NILP (Vfile_name_coding_system) \
- ? code_convert_string_norecord (name, Vfile_name_coding_system, 1) \
- : (! NILP (Vdefault_file_name_coding_system) \
- ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 1) \
- : name))
-
+#define ENCODE_FILE(NAME) encode_file_name (NAME)
/* Decode the file name NAME using the specified coding system
for file names, if any. */
-#define DECODE_FILE(name) \
- (! NILP (Vfile_name_coding_system) \
- ? code_convert_string_norecord (name, Vfile_name_coding_system, 0) \
- : (! NILP (Vdefault_file_name_coding_system) \
- ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 0) \
- : name))
-
+#define DECODE_FILE(NAME) decode_file_name (NAME)
/* Encode the string STR using the specified coding system
for system functions, if any. */
@@ -716,6 +704,8 @@ extern Lisp_Object code_convert_string (Lisp_Object, Lisp_Object,
Lisp_Object, bool, bool, bool);
extern Lisp_Object code_convert_string_norecord (Lisp_Object, Lisp_Object,
bool);
+extern Lisp_Object encode_file_name (Lisp_Object);
+extern Lisp_Object decode_file_name (Lisp_Object);
extern Lisp_Object raw_text_coding_system (Lisp_Object);
extern Lisp_Object coding_inherit_eol_type (Lisp_Object, Lisp_Object);
extern Lisp_Object complement_process_encoding_system (Lisp_Object);