[Emacs-diffs] Changes to emacs/src/xfns.c

[Dave Love]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.585 emacs/src/xfns.c:1.586
*** emacs/src/xfns.c:1.585      Sun Jul 13 13:29:24 2003
--- emacs/src/xfns.c    Tue Jul 22 13:31:33 2003
***************
*** 1935,1945 ****
           managers which don't support that encoding.  So, if NAME
           contains only ASCII and 8859-1 characters, encode it by
           iso-latin-1, and use "STRING" in text.encoding hoping that
!          such window manager at least analize this format correctly,
           i.e. treat 8-bit bytes as 8859-1 characters.
  
           We may also be able to use "UTF8_STRING" in text.encoding
!          in the feature which can encode all Unicode characters.
           But, for the moment, there's no way to know that the
           current window manager supports it or not.  */
        coding_system = Qcompound_text;
--- 1935,1945 ----
           managers which don't support that encoding.  So, if NAME
           contains only ASCII and 8859-1 characters, encode it by
           iso-latin-1, and use "STRING" in text.encoding hoping that
!          such window managers at least analyze this format correctly,
           i.e. treat 8-bit bytes as 8859-1 characters.
  
           We may also be able to use "UTF8_STRING" in text.encoding
!          in the future which can encode all Unicode characters.
           But, for the moment, there's no way to know that the
           current window manager supports it or not.  */
        coding_system = Qcompound_text;
***************
*** 7565,7571 ****
  
  #if HAVE_PNG
  
! #include <libpng/png.h>
  
  /* Function prototypes.  */
  
--- 7565,7577 ----
  
  #if HAVE_PNG
  
! #ifdef HAVE_PNG_H
! # include <png.h>
! #else
! # ifdef HAVE_LIBPNG_PNG_H
! #  include <libpng/png.h>
! # endif
! #endif
  
  /* Function prototypes.  */