diff options
| author | Joakim Verona | 2011-08-08 17:08:48 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-08-08 17:08:48 +0200 |
| commit | 1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de (patch) | |
| tree | cf8b108fccada9dca76dc616e5333739d8825728 /src/ChangeLog | |
| parent | 23e9910c1fc51657f08b4ab125c0c44e5860d942 (diff) | |
| parent | d56176114c8c9226a43db4bf68df562486e454ed (diff) | |
| download | emacs-1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de.tar.gz emacs-1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de.zip | |
merge upstream
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 039c225c1f6..4df4455e862 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,18 @@ | |||
| 1 | 2011-08-08 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * ftfont.c (ftfont_pattern_entity): Copy the extras argument to | ||
| 4 | the font entity extracted from the cache (Bug#8109). | ||
| 5 | |||
| 6 | 2011-08-07 Chong Yidong <cyd@stupidchicken.com> | ||
| 7 | |||
| 8 | * composite.c (autocmp_chars): Don't reset point. That is done by | ||
| 9 | restore_point_unwind (Bug#5984). | ||
| 10 | |||
| 11 | 2011-08-07 Juri Linkov <juri@jurta.org> | ||
| 12 | |||
| 13 | * editfns.c (Fformat_time_string): Doc fix, add tag `usage:' | ||
| 14 | to show the arg `TIME' instead of `TIMEVAL'. | ||
| 15 | |||
| 1 | 2011-08-06 Eli Zaretskii <eliz@gnu.org> | 16 | 2011-08-06 Eli Zaretskii <eliz@gnu.org> |
| 2 | 17 | ||
| 3 | * xdisp.c (set_cursor_from_row): Fix cursor positioning when a | 18 | * xdisp.c (set_cursor_from_row): Fix cursor positioning when a |