Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 474-484)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 88-91)

   - Merge from emacs--cvs-trunk--0
   - Update FSF's address in GPL notices
   - Update from CVS

1 files changed, 12 insertions, 4 deletions

diff --git a/src/eval.c b/src/eval.c
index f625258229e..3b4e9fe0324 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -807,8 +807,16 @@ usage: (defvar SYMBOL &optional INITVALUE DOCSTRING)  */)
 
   sym = Fcar (args);
   if (SYMBOL_CONSTANT_P (sym))
-    error ("Constant symbol `%s' specified in defvar",
-           SDATA (SYMBOL_NAME (sym)));
+    {
+      /* For updward compatibility, allow (defvar :foo (quote :foo)).  */
+      tem = Fcar (Fcdr (args));
+      if (! (CONSP (tem)
+             && EQ (XCAR (tem), Qquote)
+             && CONSP (XCDR (tem))
+             && EQ (XCAR (XCDR (tem)), sym)))
+        error ("Constant symbol `%s' specified in defvar",
+               SDATA (SYMBOL_NAME (sym)));
+    }
 
   tail = Fcdr (args);
   if (!NILP (Fcdr (Fcdr (tail))))
@@ -2085,7 +2093,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
     return form;
 
   QUIT;
-  if (consing_since_gc > gc_cons_threshold)
+  if (consing_since_gc > gc_cons_combined_threshold)
     {
       GCPRO1 (form);
       Fgarbage_collect ();
@@ -2785,7 +2793,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
   register int i;
 
   QUIT;
-  if (consing_since_gc > gc_cons_threshold)
+  if (consing_since_gc > gc_cons_combined_threshold)
     Fgarbage_collect ();
 
   if (++lisp_eval_depth > max_lisp_eval_depth)