diff options
| author | Joakim Verona | 2011-07-23 09:37:55 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-07-23 09:37:55 +0200 |
| commit | 32feb900b6bbe2e2898984ace501fbb6ed234d49 (patch) | |
| tree | 82c1eeef72448f5dc5703b15896e87cdf16b7c74 /src/ChangeLog | |
| parent | 37d53e76fafe8ba6732cbeb1c481a23ea5ade726 (diff) | |
| parent | b2d0c91afda345844c6e4b647b1b0fd6faac6875 (diff) | |
| download | emacs-32feb900b6bbe2e2898984ace501fbb6ed234d49.tar.gz emacs-32feb900b6bbe2e2898984ace501fbb6ed234d49.zip | |
merge from upstream
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 65cd07df0ae..0b06e5bf2c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-22 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (rows_from_pos_range): Don't ignore glyphs whose object | ||
| 4 | is an integer, which is important for empty lines. (Bug#9149) | ||
| 5 | |||
| 1 | 2011-07-22 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-07-22 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * frame.c (Fmodify_frame_parameters): In tty case, update the | 8 | * frame.c (Fmodify_frame_parameters): In tty case, update the |