Merge from trunk.

2 files changed, 5 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 87f64244c48..5dafba7cdc1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -245,6 +245,10 @@
 
         * alloc.c (Fmake_string): Check for out-of-range init.
 
+2011-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (Fdefvaralias): Also mark the target as variable-special-p.
+
 2011-06-14  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xfns.c (x_set_scroll_bar_default_width): Remove argument to
diff --git a/src/eval.c b/src/eval.c
index eff50a4de52..be582775fea 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -768,6 +768,7 @@ The return value is BASE-VARIABLE.  */)
   }
 
   sym->declared_special = 1;
+  XSYMBOL (base_variable)->declared_special = 1;
   sym->redirect = SYMBOL_VARALIAS;
   SET_SYMBOL_ALIAS (sym, XSYMBOL (base_variable));
   sym->constant = SYMBOL_CONSTANT_P (base_variable);