diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/abbrev.c | 26 | ||||
| -rw-r--r-- | src/sunfns.c | 4 | ||||
| -rw-r--r-- | src/w16select.c | 6 |
3 files changed, 19 insertions, 17 deletions
diff --git a/src/abbrev.c b/src/abbrev.c index f30986db34..06bb1f98e5 100644 --- a/src/abbrev.c +++ b/src/abbrev.c @@ -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 @@ which is incremented each time the abbrev is used.") 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 @@ The default is to try buffer's mode-specific abbrev table, then global table.") 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 @@ Returns the abbrev symbol, if expansion took place.") 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 @@ Returns the abbrev symbol, if expansion took place.") /* 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 @@ is not undone.") 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 @@ write_abbrev (sym, stream) 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 @@ describe_abbrev (sym, stream) { 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); diff --git a/src/sunfns.c b/src/sunfns.c index 065e249082..c526100257 100644 --- a/src/sunfns.c +++ b/src/sunfns.c @@ -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 @@ sun_item_create (Pair) 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 diff --git a/src/w16select.c b/src/w16select.c index df739a1356..f92e1a8c17 100644 --- a/src/w16select.c +++ b/src/w16select.c @@ -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 @@ 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 (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)) |