Merge from emacs-23 branch, up to 2010-05-20T22:16:19Z!juri@jurta.org.

2 files changed, 8 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9267a96467c..f91ec458464 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * image.c (syms_of_image): Don't access XSYMBOL's internals directly.
+
 2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350.
diff --git a/src/image.c b/src/image.c
index b5b1843ed94..260e33c3cfb 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8801,11 +8801,13 @@ non-numeric, there is no explicit limit on the size of images.  */);
 #ifdef HAVE_NTGUI
   Qlibpng_version = intern_c_string ("libpng-version");
   staticpro (&Qlibpng_version);
+  Fset (Qlibpng_version,
 #if HAVE_PNG
-  SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (PNG_LIBPNG_VER));
+        make_number (PNG_LIBPNG_VER)
 #else
-  SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (-1));
+        make_number (-1)
 #endif
+        );
 #endif
 
 #if defined (HAVE_XPM) || defined (HAVE_NS)