diff options
| author | Joakim Verona | 2011-08-02 11:42:58 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-08-02 11:42:58 +0200 |
| commit | c040cbd945a3fde6324c73563dc2d11629ad3081 (patch) | |
| tree | 88cb76e2533cb211b0df151a31fab8e6ad24371e /src/ChangeLog | |
| parent | e31c3c3f9c2118bf73f32a9573fefd01c9966bc2 (diff) | |
| parent | d90e2ea0eeccb7422fc7c8ab727a61c49c135e03 (diff) | |
| download | emacs-c040cbd945a3fde6324c73563dc2d11629ad3081.tar.gz emacs-c040cbd945a3fde6324c73563dc2d11629ad3081.zip | |
merge upstream + stray par fix
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 623ccc6f4be..4e8217cdf5f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2011-08-01 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (forward_to_next_line_start): Accept additional argument | ||
| 4 | BIDI_IT_PREV, and store into it the state of the bidi iterator had | ||
| 5 | on the newline. | ||
| 6 | (reseat_at_next_visible_line_start): Use the bidi iterator state | ||
| 7 | returned by forward_to_next_line_start to restore the state of | ||
| 8 | it->bidi_it after backing up to previous newline. (Bug#9212) | ||
| 9 | |||
| 1 | 2011-07-30 Andreas Schwab <schwab@linux-m68k.org> | 10 | 2011-07-30 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 11 | ||
| 3 | * regex.c (re_comp): Protoize. | 12 | * regex.c (re_comp): Protoize. |