aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2010-05-07 16:51:16 +0300
committerEli Zaretskii2010-05-07 16:51:16 +0300
commitd16bdfc3a1e288643e340848d260bac6443cf445 (patch)
treed808da62fbef93fbafe6daf77bbf2d37b17e2f4b
parent9fdec8bc72cc00fa97d72d96e12276846a0ce2f6 (diff)
downloademacs-d16bdfc3a1e288643e340848d260bac6443cf445.tar.gz
emacs-d16bdfc3a1e288643e340848d260bac6443cf445.zip
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'.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/msdos.c3
-rw-r--r--src/w16select.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c2ba56b4e6f..0cea5ff8e45 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12010-05-07 Eli Zaretskii <eliz@gnu.org> 12010-05-07 Eli Zaretskii <eliz@gnu.org>
2 2
3 * msdos.c (dos_set_window_size):
4 * w16select.c (Fx_selection_exists_p): Use `Fsymbol_value (foo)'
5 instead of `XSYMBOL (foo)->value'.
6
3 Fix the MS-DOS build, broken by autoconfiscation. 7 Fix the MS-DOS build, broken by autoconfiscation.
4 8
5 * Makefile.in: Don't use Make-style comments past the "start of 9 * 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)
528 /* If the user specified a special video mode for these dimensions, 528 /* If the user specified a special video mode for these dimensions,
529 use that mode. */ 529 use that mode. */
530 sprintf (video_name, "screen-dimensions-%dx%d", *rows, *cols); 530 sprintf (video_name, "screen-dimensions-%dx%d", *rows, *cols);
531 video_mode = XSYMBOL (Fintern_soft (build_string (video_name), 531 video_mode = Fsymbol_value (Fintern_soft (build_string (video_name), Qnil));
532 Qnil))-> value;
533 532
534 if (INTEGERP (video_mode) 533 if (INTEGERP (video_mode)
535 && (video_mode_value = XINT (video_mode)) > 0) 534 && (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'. */)
685 into the clipboard if we run under Windows, so we cannot check 685 into the clipboard if we run under Windows, so we cannot check
686 the clipboard alone.) */ 686 the clipboard alone.) */
687 if ((EQ (selection, Qnil) || EQ (selection, QPRIMARY)) 687 if ((EQ (selection, Qnil) || EQ (selection, QPRIMARY))
688 && ! NILP (SYMBOL_VALUE (Fintern_soft (build_string ("kill-ring"), 688 && ! NILP (Fsymbol_value (Fintern_soft (build_string ("kill-ring"),
689 Qnil)))) 689 Qnil))))
690 return Qt; 690 return Qt;
691 691
692 if (EQ (selection, QCLIPBOARD)) 692 if (EQ (selection, QCLIPBOARD))