Mercurial > emacs
changeset 39584:6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
symbols' value directly.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Fri, 05 Oct 2001 09:51:48 +0000 |
parents | 936ffa2961ca |
children | 72b9c859446e |
files | src/abbrev.c src/sunfns.c src/w16select.c |
diffstat | 3 files changed, 19 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/abbrev.c Fri Oct 05 09:51:00 2001 +0000 +++ b/src/abbrev.c Fri Oct 05 09:51:48 2001 +0000 @@ -1,5 +1,6 @@ /* Primitives for word-abbrev mode. - Copyright (C) 1985, 1986, 1993, 1996, 1998 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -128,7 +129,7 @@ sym = Fintern (name, table); - oexp = XSYMBOL (sym)->value; + oexp = SYMBOL_VALUE (sym); ohook = XSYMBOL (sym)->function; if (!((EQ (oexp, expansion) || (STRINGP (oexp) && STRINGP (expansion) @@ -189,12 +190,13 @@ sym = Qnil; if (!NILP (current_buffer->abbrev_table)) sym = Fintern_soft (abbrev, current_buffer->abbrev_table); - if (NILP (XSYMBOL (sym)->value)) + if (NILP (SYMBOL_VALUE (sym))) sym = Qnil; if (NILP (sym)) sym = Fintern_soft (abbrev, Vglobal_abbrev_table); } - if (NILP (XSYMBOL (sym)->value)) return Qnil; + if (NILP (SYMBOL_VALUE (sym))) + return Qnil; return sym; } @@ -290,10 +292,10 @@ wordend - wordstart, wordend_byte - wordstart_byte); else XSETFASTINT (sym, 0); - if (INTEGERP (sym) || NILP (XSYMBOL (sym)->value)) + if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym))) sym = oblookup (Vglobal_abbrev_table, buffer, wordend - wordstart, wordend_byte - wordstart_byte); - if (INTEGERP (sym) || NILP (XSYMBOL (sym)->value)) + if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym))) return value; if (INTERACTIVE && !EQ (minibuf_window, selected_window)) @@ -318,7 +320,7 @@ /* If this abbrev has an expansion, delete the abbrev and insert the expansion. */ - expansion = XSYMBOL (sym)->value; + expansion = SYMBOL_VALUE (sym); if (STRINGP (expansion)) { SET_PT (wordstart); @@ -404,7 +406,7 @@ Lisp_Object val; int zv_before; - val = XSYMBOL (Vlast_abbrev)->value; + val = SYMBOL_VALUE (Vlast_abbrev); if (!STRINGP (val)) error ("value of abbrev-symbol must be a string"); zv_before = ZV; @@ -426,13 +428,13 @@ Lisp_Object sym, stream; { Lisp_Object name; - if (NILP (XSYMBOL (sym)->value)) + if (NILP (SYMBOL_VALUE (sym))) return; insert (" (", 5); XSETSTRING (name, XSYMBOL (sym)->name); Fprin1 (name, stream); insert (" ", 1); - Fprin1 (XSYMBOL (sym)->value, stream); + Fprin1 (SYMBOL_VALUE (sym), stream); insert (" ", 1); Fprin1 (XSYMBOL (sym)->function, stream); insert (" ", 1); @@ -446,14 +448,14 @@ { Lisp_Object one; - if (NILP (XSYMBOL (sym)->value)) + if (NILP (SYMBOL_VALUE (sym))) return; one = make_number (1); Fprin1 (Fsymbol_name (sym), stream); Findent_to (make_number (15), one); Fprin1 (XSYMBOL (sym)->plist, stream); Findent_to (make_number (20), one); - Fprin1 (XSYMBOL (sym)->value, stream); + Fprin1 (SYMBOL_VALUE (sym), stream); if (!NILP (XSYMBOL (sym)->function)) { Findent_to (make_number (45), one);
--- a/src/sunfns.c Fri Oct 05 09:51:00 2001 +0000 +++ b/src/sunfns.c Fri Oct 05 09:51:48 2001 +0000 @@ -1,5 +1,5 @@ /* Functions for Sun Windows menus and selection buffer. - Copyright (C) 1987, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1999, 2001 Free Software Foundation, Inc. This file is probably totally obsolete. In any case, the FSF is unwilling to support it. We agreed to include it in our distribution @@ -366,7 +366,7 @@ CHECK_STRING(String, 0); Value = Fcdr(Pair); if (SYMBOLP (Value)) - Value = XSYMBOL(Value)->value; + Value = SYMBOL_VALUE (Value); if (VECTORP (Value)) { submenu = sun_menu_create (Value); menu_item = menu_create_item
--- a/src/w16select.c Fri Oct 05 09:51:00 2001 +0000 +++ b/src/w16select.c Fri Oct 05 09:51:48 2001 +0000 @@ -1,5 +1,5 @@ /* 16-bit Windows Selection processing for emacs on MS-Windows - Copyright (C) 1996, 1997 Free Software Foundation. + Copyright (C) 1996, 1997, 2001 Free Software Foundation. This file is part of GNU Emacs. @@ -714,8 +714,8 @@ into the clipboard if we run under Windows, so we cannot check the clipboard alone.) */ if ((EQ (selection, Qnil) || EQ (selection, QPRIMARY)) - && ! NILP (XSYMBOL (Fintern_soft (build_string ("kill-ring"), - Qnil))->value)) + && ! NILP (SYMBOL_VALUE (Fintern_soft (build_string ("kill-ring"), + Qnil)))) return Qt; if (EQ (selection, QCLIPBOARD))