diff options
| author | Johan Bockgård | 2012-01-09 17:44:18 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-01-09 17:44:18 +0800 |
| commit | 1ba94341834d2846ca3bde3e5c1154fb365b7360 (patch) | |
| tree | 64ba0109696553cd0d1d6fa1a0fafe1971f9f6d6 /src/ChangeLog | |
| parent | 3f235eece06afee170bf143cfde2ca8702384e75 (diff) | |
| download | emacs-1ba94341834d2846ca3bde3e5c1154fb365b7360.tar.gz emacs-1ba94341834d2846ca3bde3e5c1154fb365b7360.zip | |
Avoid crash on composition (backport from trunk).
* xdisp.c (fill_composite_glyph_string): Always set s->face, to
avoid a crash (bug#9496).
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 fcaff20727d..7cfb3aa61e1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-11-11 Johan Bockgård <bojohan@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (fill_composite_glyph_string): Always set s->face, to | ||
| 4 | avoid a crash (bug#9496). | ||
| 5 | |||
| 1 | 2012-01-09 Chong Yidong <cyd@gnu.org> | 6 | 2012-01-09 Chong Yidong <cyd@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (note_mouse_highlight): Fix use of uninitialized var. | 8 | * xdisp.c (note_mouse_highlight): Fix use of uninitialized var. |