[Emacs-diffs] Changes to emacs/src/coding.h

[Stefan Monnier]

Index: emacs/src/coding.h
diff -c emacs/src/coding.h:1.68 emacs/src/coding.h:1.69
*** emacs/src/coding.h:1.68     Mon Sep  1 15:45:52 2003
--- emacs/src/coding.h  Tue Nov 23 05:21:31 2004
***************
*** 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,581 ****
     for file names, if any.  */
  #define ENCODE_FILE(name)                                                \
    (! NILP (Vfile_name_coding_system)                                     \
!    && XFASTINT (Vfile_name_coding_system) != 0                                
   \
     ? code_convert_string_norecord (name, Vfile_name_coding_system, 1)    \
     : (! NILP (Vdefault_file_name_coding_system)                               
   \
!       && XFASTINT (Vdefault_file_name_coding_system) != 0                \
        ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 
1) \
        : name))
  
--- 573,582 ----
     for file names, if any.  */
  #define ENCODE_FILE(name)                                                \
    (! NILP (Vfile_name_coding_system)                                     \
!    && !EQ (Vfile_name_coding_system, make_number (0))                    \
     ? code_convert_string_norecord (name, Vfile_name_coding_system, 1)    \
     : (! NILP (Vdefault_file_name_coding_system)                               
   \
!       && !EQ (Vdefault_file_name_coding_system, make_number (0))         \
        ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 
1) \
        : name))
  
***************
*** 583,592 ****
     for file names, if any.  */
  #define DECODE_FILE(name)                                                \
    (! NILP (Vfile_name_coding_system)                                     \
!    && XFASTINT (Vfile_name_coding_system) != 0                                
   \
     ? code_convert_string_norecord (name, Vfile_name_coding_system, 0)    \
     : (! NILP (Vdefault_file_name_coding_system)                               
   \
!       && XFASTINT (Vdefault_file_name_coding_system) != 0                \
        ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 
0) \
        : name))
  
--- 584,593 ----
     for file names, if any.  */
  #define DECODE_FILE(name)                                                \
    (! NILP (Vfile_name_coding_system)                                     \
!    && !EQ (Vfile_name_coding_system, make_number (0))                    \
     ? code_convert_string_norecord (name, Vfile_name_coding_system, 0)    \
     : (! NILP (Vdefault_file_name_coding_system)                               
   \
!       && !EQ (Vdefault_file_name_coding_system, make_number (0))         \
        ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 
0) \
        : name))
  
***************
*** 595,601 ****
     for w32 system functions, if any.  */
  #define ENCODE_SYSTEM(str)                                               \
    (! NILP (Vlocale_coding_system)                                        \
!    && XFASTINT (Vlocale_coding_system) != 0                              \
     ? code_convert_string_norecord (str, Vlocale_coding_system, 1)        \
     : str)
  
--- 596,602 ----
     for w32 system functions, if any.  */
  #define ENCODE_SYSTEM(str)                                               \
    (! NILP (Vlocale_coding_system)                                        \
!    && !EQ (Vlocale_coding_system, make_number (0))                       \
     ? code_convert_string_norecord (str, Vlocale_coding_system, 1)        \
     : str)
  
***************
*** 603,609 ****
     for w32 system functions, if any.  */
  #define DECODE_SYSTEM(name)                                              \
    (! NILP (Vlocale_coding_system)                                        \
!    && XFASTINT (Vlocale_coding_system) != 0                              \
     ? code_convert_string_norecord (str, Vlocale_coding_system, 0)        \
     : str)
  
--- 604,610 ----
     for w32 system functions, if any.  */
  #define DECODE_SYSTEM(name)                                              \
    (! NILP (Vlocale_coding_system)                                        \
!    && !EQ (Vlocale_coding_system, make_number (0))                       \
     ? code_convert_string_norecord (str, Vlocale_coding_system, 0)        \
     : str)