Mercurial > emacs

changeset 37858:fd7c0dac2110

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing symbols' value directly.
author Gerd Moellmann <gerd@gnu.org>
date Mon, 21 May 2001 12:34:11 +0000
parents b3fd27aaa58d
children 5c792c525a42
files src/abbrev.c src/buffer.c src/coding.c src/fns.c src/frame.c src/keyboard.c src/minibuf.c src/sunfns.c src/w16select.c
diffstat 9 files changed, 33 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/src/abbrev.c	Mon May 21 12:28:26 2001 +0000
+++ b/src/abbrev.c	Mon May 21 12:34:11 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/buffer.c	Mon May 21 12:28:26 2001 +0000
+++ b/src/buffer.c	Mon May 21 12:34:11 2001 +0000
@@ -1682,7 +1682,7 @@
 
   for (tail = b->local_var_alist; !NILP (tail); tail = XCDR (tail))
     {
-      valcontents = XSYMBOL (XCAR (XCAR (tail)))->value;
+      valcontents = SYMBOL_VALUE (XCAR (XCAR (tail)));
       if ((BUFFER_LOCAL_VALUEP (valcontents)
 	   || SOME_BUFFER_LOCAL_VALUEP (valcontents))
 	  && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
@@ -1697,7 +1697,7 @@
   if (old_buf)
     for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCDR (tail))
       {
-	valcontents = XSYMBOL (XCAR (XCAR (tail)))->value;
+	valcontents = SYMBOL_VALUE (XCAR (XCAR (tail)));
 	if ((BUFFER_LOCAL_VALUEP (valcontents)
 	     || SOME_BUFFER_LOCAL_VALUEP (valcontents))
 	    && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
@@ -2259,26 +2259,26 @@
       sym = XCAR (XCAR (alist));
 
       /* Need not do anything if some other buffer's binding is now encached.  */
-      tem = XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->buffer;
+      tem = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer;
       if (BUFFERP (tem) && XBUFFER (tem) == current_buffer)
 	{
 	  /* Symbol is set up for this buffer's old local value.
 	     Set it up for the current buffer with the default value.  */
 
-	  tem = XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr;
+	  tem = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->cdr;
 	  /* Store the symbol's current value into the alist entry
 	     it is currently set up for.  This is so that, if the
 	     local is marked permanent, and we make it local again
 	     later in Fkill_all_local_variables, we don't lose the value.  */
 	  XCDR (XCAR (tem))
-	    = do_symval_forwarding (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->realvalue);
+	    = do_symval_forwarding (XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->realvalue);
 	  /* Switch to the symbol's default-value alist entry.  */
 	  XCAR (tem) = tem;
 	  /* Mark it as current for buffer B.  */
-	  XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->buffer = buffer;
+	  XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer = buffer;
 	  /* Store the current value into any forwarding in the symbol.  */
 	  store_symval_forwarding (sym,
-				   XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->realvalue,
+				   XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->realvalue,
 				   XCDR (tem), NULL);
 	}
     }
--- a/src/coding.c	Mon May 21 12:28:26 2001 +0000
+++ b/src/coding.c	Mon May 21 12:34:11 2001 +0000
@@ -1,6 +1,7 @@
 /* Coding system handler (conversion, detection, and etc).
    Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
+   Copyright (C) 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4109,7 +4110,7 @@
   if (! mask)
     idx = CODING_CATEGORY_IDX_RAW_TEXT;
 
-  val = XSYMBOL (XVECTOR (Vcoding_category_table)->contents[idx])->value;
+  val = SYMBOL_VALUE (XVECTOR (Vcoding_category_table)->contents[idx]);
 
   if (coding->eol_type != CODING_EOL_UNDECIDED)
     {
@@ -6862,7 +6863,7 @@
     {
       Lisp_Object val;
 
-      val = XSYMBOL (XVECTOR (Vcoding_category_table)->contents[i])->value;
+      val = SYMBOL_VALUE (XVECTOR (Vcoding_category_table)->contents[i]);
       if (!NILP (val))
 	{
 	  if (! coding_system_table[i])
--- a/src/fns.c	Mon May 21 12:28:26 2001 +0000
+++ b/src/fns.c	Mon May 21 12:34:11 2001 +0000
@@ -5020,7 +5020,7 @@
 
 	  if (STRING_MULTIBYTE (object))
 	    /* use default, we can't guess correct value */
-	    coding_system = XSYMBOL (XCAR (Vcoding_category_list))->value;
+	    coding_system = SYMBOL_VALUE (XCAR (Vcoding_category_list));
 	  else 
 	    coding_system = Qraw_text;
 	}
--- a/src/frame.c	Mon May 21 12:28:26 2001 +0000
+++ b/src/frame.c	Mon May 21 12:34:11 2001 +0000
@@ -1914,7 +1914,7 @@
   if (SYMBOLP (prop))
     {
       Lisp_Object valcontents;
-      valcontents = XSYMBOL (prop)->value;
+      valcontents = SYMBOL_VALUE (prop);
       if ((BUFFER_LOCAL_VALUEP (valcontents)
   	   || SOME_BUFFER_LOCAL_VALUEP (valcontents))
 	  && XBUFFER_LOCAL_VALUE (valcontents)->check_frame
--- a/src/keyboard.c	Mon May 21 12:28:26 2001 +0000
+++ b/src/keyboard.c	Mon May 21 12:34:11 2001 +0000
@@ -10640,7 +10640,7 @@
     "Normal hook run when clearing the echo area.");
 #endif
   Qecho_area_clear_hook = intern ("echo-area-clear-hook");
-  XSYMBOL (Qecho_area_clear_hook)->value = Qnil;
+  SET_SYMBOL_VALUE (Qecho_area_clear_hook, Qnil);
 
   DEFVAR_LISP ("lucid-menu-bar-dirty-flag", &Vlucid_menu_bar_dirty_flag,
     "t means menu bar, specified Lucid style, needs to be recomputed.");
--- a/src/minibuf.c	Mon May 21 12:28:26 2001 +0000
+++ b/src/minibuf.c	Mon May 21 12:34:11 2001 +0000
@@ -601,7 +601,7 @@
       Lisp_Object histval;
 
       /* If variable is unbound, make it nil.  */
-      if (EQ (XSYMBOL (Vminibuffer_history_variable)->value, Qunbound))
+      if (EQ (SYMBOL_VALUE (Vminibuffer_history_variable), Qunbound))
 	Fset (Vminibuffer_history_variable, Qnil);
 
       histval = Fsymbol_value (Vminibuffer_history_variable);
--- a/src/sunfns.c	Mon May 21 12:28:26 2001 +0000
+++ b/src/sunfns.c	Mon May 21 12:34:11 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	Mon May 21 12:28:26 2001 +0000
+++ b/src/w16select.c	Mon May 21 12:34:11 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))