(Fdefvar): Don't try to set constant symbols.

diff --git a/src/ChangeLog b/src/ChangeLog
index 046d1a321fe36d1bd18867178db7e8e2d982556b..dcc8d0f2bd5fe998a95b365f7bc6483e6406803c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-27  Juanma Barranquero  <lekktu@gmail.com>
+
+       * eval.c (Fdefvar): Don't try to set constant symbols.
+
 2005-06-25  Richard M. Stallman  <rms@gnu.org>
 
        * macfns.c (Fx_show_tip): Pass new arg to try_window.

diff --git a/src/eval.c b/src/eval.c
index c33021da7b7aec981e18bfd5ce69bf6416238fa8..589bf593f156fee5bc5c081fdba39bec4fdf6e5d 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -806,6 +806,10 @@ usage: (defvar SYMBOL &optional INITVALUE DOCSTRING)  */)
   register Lisp_Object sym, tem, tail;
 
   sym = Fcar (args);
+  if (SYMBOL_CONSTANT_P (sym))
+    error ("Cannot defvar a constant symbol: %s",
+           SDATA (SYMBOL_NAME (sym)));
+
   tail = Fcdr (args);
   if (!NILP (Fcdr (Fcdr (tail))))
     error ("Too many arguments");