diff options
| author | Joakim Verona | 2013-06-14 23:54:26 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-06-14 23:54:26 +0200 |
| commit | 2a342ba649407875a265b8d56c9f7c3d87c4b43c (patch) | |
| tree | d9e2cb1a6c10854cf55a018b14d2b0cef48eafaf /src/ChangeLog | |
| parent | e32984567a0e1c100011adee2311cbc1fdf61433 (diff) | |
| parent | 230dcbaf2ff0615d72c5d2ca41edb999b6bc1b87 (diff) | |
| download | emacs-2a342ba649407875a265b8d56c9f7c3d87c4b43c.tar.gz emacs-2a342ba649407875a265b8d56c9f7c3d87c4b43c.zip | |
Merge branch 'trunk' into xwidget
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 38eb460359c..827092e7f8a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2013-06-13 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * lread.c (syms_of_lread): | ||
| 4 | * fns.c (Fprovide): Adjust to new format of after-load-alist. | ||
| 5 | |||
| 6 | 2013-06-13 Kelly Dean <kellydeanch@yahoo.com> (tiny change) | ||
| 7 | |||
| 8 | * fileio.c (Fdo_auto_save): Trap errors in auto-save-hook. (Bug#14479) | ||
| 9 | |||
| 1 | 2013-06-12 Xue Fuqiao <xfq.free@gmail.com> | 10 | 2013-06-12 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 11 | ||
| 3 | * fileio.c (expand_file_name): Doc fix. | 12 | * fileio.c (expand_file_name): Doc fix. |