Merge from trunk.

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 87f6424..5dafba7 100644 (file)
--- 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