aboutsummaryrefslogtreecommitdiffstats
path: root/src/data.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/data.c')
-rw-r--r--src/data.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/data.c b/src/data.c
index b0a6a2ba9aa..f524b097df8 100644
--- a/src/data.c
+++ b/src/data.c
@@ -60,10 +60,6 @@ Boston, MA 02111-1307, USA. */
60extern double atof (); 60extern double atof ();
61#endif /* !atof */ 61#endif /* !atof */
62 62
63/* Nonzero means it is an error to set a symbol whose name starts with
64 colon. */
65int keyword_symbols_constant_flag;
66
67Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; 63Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound;
68Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; 64Lisp_Object Qerror_conditions, Qerror_message, Qtop_level;
69Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; 65Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range;
@@ -624,8 +620,7 @@ DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0, "Make SYMBOL's value be
624 CHECK_SYMBOL (symbol, 0); 620 CHECK_SYMBOL (symbol, 0);
625 if (NILP (symbol) || EQ (symbol, Qt) 621 if (NILP (symbol) || EQ (symbol, Qt)
626 || (XSYMBOL (symbol)->name->data[0] == ':' 622 || (XSYMBOL (symbol)->name->data[0] == ':'
627 && EQ (XSYMBOL (symbol)->obarray, initial_obarray) 623 && EQ (XSYMBOL (symbol)->obarray, initial_obarray)))
628 && keyword_symbols_constant_flag))
629 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); 624 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
630 Fset (symbol, Qunbound); 625 Fset (symbol, Qunbound);
631 return symbol; 626 return symbol;
@@ -989,7 +984,7 @@ set_internal (symbol, newval, buf, bindflag)
989 if (NILP (symbol) || EQ (symbol, Qt) 984 if (NILP (symbol) || EQ (symbol, Qt)
990 || (XSYMBOL (symbol)->name->data[0] == ':' 985 || (XSYMBOL (symbol)->name->data[0] == ':'
991 && EQ (XSYMBOL (symbol)->obarray, initial_obarray) 986 && EQ (XSYMBOL (symbol)->obarray, initial_obarray)
992 && keyword_symbols_constant_flag && ! EQ (newval, symbol))) 987 && !EQ (newval, symbol)))
993 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); 988 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
994 valcontents = XSYMBOL (symbol)->value; 989 valcontents = XSYMBOL (symbol)->value;
995 990
@@ -2829,11 +2824,6 @@ syms_of_data ()
2829 staticpro (&Qbool_vector); 2824 staticpro (&Qbool_vector);
2830 staticpro (&Qhash_table); 2825 staticpro (&Qhash_table);
2831 2826
2832 DEFVAR_BOOL ("keyword-symbols-constant-flag", &keyword_symbols_constant_flag,
2833 "Non-nil means it is an error to set a keyword symbol.\n\
2834A keyword symbol is a symbol whose name starts with a colon (`:').");
2835 keyword_symbols_constant_flag = 1;
2836
2837 defsubr (&Seq); 2827 defsubr (&Seq);
2838 defsubr (&Snull); 2828 defsubr (&Snull);
2839 defsubr (&Stype_of); 2829 defsubr (&Stype_of);