Don't use XSYMBOL (foo)->value.

 msdos.c (dos_set_window_size):
 w16select.c (Fx_selection_exists_p): Use `Fsymbol_value (foo)'
 instead of `XSYMBOL (foo)->value'.

diff --git a/src/ChangeLog b/src/ChangeLog
index c2ba56b4e6fe2e07e01f0dd7e7e15b4f15d86057..0cea5ff8e452cef3ed11ed3da723d3311c55efff 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2010-05-07  Eli Zaretskii  <eliz@gnu.org>
 
+       * msdos.c (dos_set_window_size):
+       * w16select.c (Fx_selection_exists_p): Use `Fsymbol_value (foo)'
+       instead of `XSYMBOL (foo)->value'.
+
        Fix the MS-DOS build, broken by autoconfiscation.
 
        * Makefile.in: Don't use Make-style comments past the "start of

diff --git a/src/msdos.c b/src/msdos.c
index 28d621f8cc143071955cc7bded3c070090661e98..ea604d299927367d941486ec19ba59f71629ac4d 100644 (file)
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -528,8 +528,7 @@ dos_set_window_size (rows, cols)
   /* If the user specified a special video mode for these dimensions,
      use that mode.  */
   sprintf (video_name, "screen-dimensions-%dx%d", *rows, *cols);
-  video_mode = XSYMBOL (Fintern_soft (build_string (video_name),
-                                     Qnil))-> value;
+  video_mode = Fsymbol_value (Fintern_soft (build_string (video_name), Qnil));
 
   if (INTEGERP (video_mode)
       && (video_mode_value = XINT (video_mode)) > 0)

diff --git a/src/w16select.c b/src/w16select.c
index c6a84e46a60f205fdef443c210214ac48dd1f7c9..9ebf6de625081fdb64258371c30d9da54e05a3cc 100644 (file)
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -685,8 +685,8 @@ and t is the same as `SECONDARY'.  */)
      into the clipboard if we run under Windows, so we cannot check
      the clipboard alone.)  */
   if ((EQ (selection, Qnil) || EQ (selection, QPRIMARY))
-      && ! NILP (SYMBOL_VALUE (Fintern_soft (build_string ("kill-ring"),
-                                            Qnil))))
+      && ! NILP (Fsymbol_value (Fintern_soft (build_string ("kill-ring"),
+                                             Qnil))))
     return Qt;
 
   if (EQ (selection, QCLIPBOARD))