From: Eli Zaretskii Date: Fri, 7 May 2010 13:51:16 +0000 (+0300) Subject: Don't use XSYMBOL (foo)->value. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~239^2~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d16bdfc3a1e288643e340848d260bac6443cf445;p=emacs.git 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 c2ba56b4e6f..0cea5ff8e45 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2010-05-07 Eli Zaretskii + * 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 28d621f8cc1..ea604d29992 100644 --- 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 c6a84e46a60..9ebf6de6250 100644 --- 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))