diff options
| author | Joakim Verona | 2011-08-09 09:20:14 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-08-09 09:20:14 +0200 |
| commit | 1e26d437b871eb5aacaf18a85fba928ef8ea25be (patch) | |
| tree | 53d06e7a5bca07e155475c55ebbd9f48d2847efc /src/ChangeLog | |
| parent | 301cce3b507f4d56b3182c15b5d741582c991e4c (diff) | |
| parent | 839dde57161c56f03ec4fbcba9e1b26d0924b8fd (diff) | |
| download | emacs-1e26d437b871eb5aacaf18a85fba928ef8ea25be.tar.gz emacs-1e26d437b871eb5aacaf18a85fba928ef8ea25be.zip | |
merge upstream.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4df4455e862..4d493eab7b1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,15 @@ | |||
| 1 | 2011-08-08 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (forward_to_next_line_start): Allow to use the | ||
| 4 | no-display-properties-and-no-overlays under bidi display. Set | ||
| 5 | disp_pos in the bidi iterator to avoid searches for display | ||
| 6 | properties and overlays. | ||
| 7 | |||
| 1 | 2011-08-08 Chong Yidong <cyd@stupidchicken.com> | 8 | 2011-08-08 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 9 | ||
| 10 | * editfns.c (Fset_time_zone_rule): Document relationship with the | ||
| 11 | setenv function. | ||
| 12 | |||
| 3 | * ftfont.c (ftfont_pattern_entity): Copy the extras argument to | 13 | * ftfont.c (ftfont_pattern_entity): Copy the extras argument to |
| 4 | the font entity extracted from the cache (Bug#8109). | 14 | the font entity extracted from the cache (Bug#8109). |
| 5 | 15 | ||