# HG changeset patch # User Stefan Monnier # Date 1101187291 0 # Node ID 04580c50dd1ce93ca5abfc77aab119f01e5237d3 # Parent 8b0845c0b2669619a7e947b360c6804343f3f149 (ENCODE_FILE, DECODE_FILE, ENCODE_SYSTEM, DECODE_SYSTEM): Don't use XFASTINT blindly. diff -r 8b0845c0b266 -r 04580c50dd1c src/coding.h --- a/src/coding.h Tue Nov 23 05:20:49 2004 +0000 +++ b/src/coding.h Tue Nov 23 05:21:31 2004 +0000 @@ -1,4 +1,5 @@ /* Header for coding system handler. + Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. @@ -572,10 +573,10 @@ for file names, if any. */ #define ENCODE_FILE(name) \ (! NILP (Vfile_name_coding_system) \ - && XFASTINT (Vfile_name_coding_system) != 0 \ + && !EQ (Vfile_name_coding_system, make_number (0)) \ ? code_convert_string_norecord (name, Vfile_name_coding_system, 1) \ : (! NILP (Vdefault_file_name_coding_system) \ - && XFASTINT (Vdefault_file_name_coding_system) != 0 \ + && !EQ (Vdefault_file_name_coding_system, make_number (0)) \ ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 1) \ : name)) @@ -583,10 +584,10 @@ for file names, if any. */ #define DECODE_FILE(name) \ (! NILP (Vfile_name_coding_system) \ - && XFASTINT (Vfile_name_coding_system) != 0 \ + && !EQ (Vfile_name_coding_system, make_number (0)) \ ? code_convert_string_norecord (name, Vfile_name_coding_system, 0) \ : (! NILP (Vdefault_file_name_coding_system) \ - && XFASTINT (Vdefault_file_name_coding_system) != 0 \ + && !EQ (Vdefault_file_name_coding_system, make_number (0)) \ ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 0) \ : name)) @@ -595,7 +596,7 @@ for w32 system functions, if any. */ #define ENCODE_SYSTEM(str) \ (! NILP (Vlocale_coding_system) \ - && XFASTINT (Vlocale_coding_system) != 0 \ + && !EQ (Vlocale_coding_system, make_number (0)) \ ? code_convert_string_norecord (str, Vlocale_coding_system, 1) \ : str) @@ -603,7 +604,7 @@ for w32 system functions, if any. */ #define DECODE_SYSTEM(name) \ (! NILP (Vlocale_coding_system) \ - && XFASTINT (Vlocale_coding_system) != 0 \ + && !EQ (Vlocale_coding_system, make_number (0)) \ ? code_convert_string_norecord (str, Vlocale_coding_system, 0) \ : str)