diff options
| author | Eli Zaretskii | 2013-09-19 16:51:38 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-09-19 16:51:38 +0300 |
| commit | 2fa833dafe89503e3444943a76206e056100e71a (patch) | |
| tree | 0e41e753cb6e43a5e1208486199a412712b3b958 /src | |
| parent | 9e30f0e14eb8e1e03f69f57ac4d060a0ca6eedf7 (diff) | |
| download | emacs-2fa833dafe89503e3444943a76206e056100e71a.tar.gz emacs-2fa833dafe89503e3444943a76206e056100e71a.zip | |
Fix a blatant bug in restore_current_matrix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispnew.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index f1df96d75a6..0a9ce116ebb 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -1971,7 +1971,7 @@ restore_current_matrix (struct frame *f, struct glyph_matrix *saved) | |||
| 1971 | memcpy (to->glyphs[TEXT_AREA], from->glyphs[TEXT_AREA], nbytes); | 1971 | memcpy (to->glyphs[TEXT_AREA], from->glyphs[TEXT_AREA], nbytes); |
| 1972 | to->used[TEXT_AREA] = from->used[TEXT_AREA]; | 1972 | to->used[TEXT_AREA] = from->used[TEXT_AREA]; |
| 1973 | xfree (from->glyphs[TEXT_AREA]); | 1973 | xfree (from->glyphs[TEXT_AREA]); |
| 1974 | nbytes = from->used[LEFT_MARGIN_AREA]; | 1974 | nbytes = from->used[LEFT_MARGIN_AREA] * sizeof (struct glyph); |
| 1975 | if (nbytes) | 1975 | if (nbytes) |
| 1976 | { | 1976 | { |
| 1977 | memcpy (to->glyphs[LEFT_MARGIN_AREA], | 1977 | memcpy (to->glyphs[LEFT_MARGIN_AREA], |
| @@ -1981,7 +1981,7 @@ restore_current_matrix (struct frame *f, struct glyph_matrix *saved) | |||
| 1981 | } | 1981 | } |
| 1982 | else | 1982 | else |
| 1983 | to->used[LEFT_MARGIN_AREA] = 0; | 1983 | to->used[LEFT_MARGIN_AREA] = 0; |
| 1984 | nbytes = from->used[RIGHT_MARGIN_AREA]; | 1984 | nbytes = from->used[RIGHT_MARGIN_AREA] * sizeof (struct glyph); |
| 1985 | if (nbytes) | 1985 | if (nbytes) |
| 1986 | { | 1986 | { |
| 1987 | memcpy (to->glyphs[RIGHT_MARGIN_AREA], | 1987 | memcpy (to->glyphs[RIGHT_MARGIN_AREA], |