diff options
author | Joakim Verona <joakim@verona.se> | 2015-01-22 08:27:13 +0100 |
---|---|---|
committer | Joakim Verona <joakim@verona.se> | 2015-01-22 08:27:13 +0100 |
commit | 5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315 (patch) | |
tree | c9e3511c8164d2154c91820e0d90521762dc7bdf /src/dispnew.c | |
parent | d6ada5ae0fad7a5c85eb28b102bc460e9fe0aceb (diff) | |
parent | 7f4e7dd378c456b498c270b47b46aaae365a72ab (diff) | |
download | emacs-5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315.tar.gz emacs-5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315.tar.bz2 emacs-5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315.zip |
merge master
Diffstat (limited to 'src/dispnew.c')
-rw-r--r-- | src/dispnew.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 8c48ae065ac..e614ceef122 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1343,14 +1343,8 @@ realloc_glyph_pool (struct glyph_pool *pool, struct dim matrix_dim) ptrdiff_t old_nglyphs = pool->nglyphs; pool->glyphs = xpalloc (pool->glyphs, &pool->nglyphs, needed - old_nglyphs, -1, sizeof *pool->glyphs); - - /* Redisplay relies on nil as the object of special glyphs - (truncation and continuation glyphs and also blanks used to - extend each line on a TTY), so verify that memset does this. */ - verify (NIL_IS_ZERO); - - memset (pool->glyphs + old_nglyphs, 0, - (pool->nglyphs - old_nglyphs) * sizeof *pool->glyphs); + memclear (pool->glyphs + old_nglyphs, + (pool->nglyphs - old_nglyphs) * sizeof *pool->glyphs); } /* Remember the number of rows and columns because (a) we use them |