diff options
| author | Paul Eggert | 2011-06-15 11:52:30 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-15 11:52:30 -0700 |
| commit | dfc926249a7d14f037a01acba7a69339661e5107 (patch) | |
| tree | 4c5eeba568589c013f3df53a779c2bd780cd0675 /src/ChangeLog | |
| parent | ff672d2c8785de6faba84a400fb8153e9fa07cd2 (diff) | |
| parent | 8c9b210626493dd93f236d7fb312c4f6dba62892 (diff) | |
| download | emacs-dfc926249a7d14f037a01acba7a69339661e5107.tar.gz emacs-dfc926249a7d14f037a01acba7a69339661e5107.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 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 @@ | |||
| 245 | 245 | ||
| 246 | * alloc.c (Fmake_string): Check for out-of-range init. | 246 | * alloc.c (Fmake_string): Check for out-of-range init. |
| 247 | 247 | ||
| 248 | 2011-06-15 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 249 | |||
| 250 | * eval.c (Fdefvaralias): Also mark the target as variable-special-p. | ||
| 251 | |||
| 248 | 2011-06-14 Jan Djärv <jan.h.d@swipnet.se> | 252 | 2011-06-14 Jan Djärv <jan.h.d@swipnet.se> |
| 249 | 253 | ||
| 250 | * xfns.c (x_set_scroll_bar_default_width): Remove argument to | 254 | * xfns.c (x_set_scroll_bar_default_width): Remove argument to |