diff options
| author | Joakim Verona | 2013-08-14 15:04:45 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-14 15:04:45 +0200 |
| commit | d84cbc292773e6f3178b276c34f52b22220a2163 (patch) | |
| tree | d8698d5419dc821d0aa40469b2657ea5610caf87 /src/ChangeLog | |
| parent | 0c405d30ab1e3464cf3e03547db939fad0a765d0 (diff) | |
| parent | 6c195442ea35de9b22cb5c1f4884f05b5ae92222 (diff) | |
| download | emacs-d84cbc292773e6f3178b276c34f52b22220a2163.tar.gz emacs-d84cbc292773e6f3178b276c34f52b22220a2163.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 c8a1de49d68..eeae85a888c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-14 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * decompress.c (unwind_decompress): Always restore point. | ||
| 4 | |||
| 1 | 2013-08-14 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-08-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * xdisp.c (cursor_type_changed): Now static. | 7 | * xdisp.c (cursor_type_changed): Now static. |