diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-12-11 19:06:04 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-12-11 19:06:04 +0400 |
| commit | 5a80236fc8817e3b7fabcba233246ec862758a29 (patch) | |
| tree | aaed7684a58c58d15e6f0bd750f29b463bca05e3 /src/term.c | |
| parent | 5b4f37ab9c9e7aa5472c47d9e9c2b508344f4858 (diff) | |
| download | emacs-5a80236fc8817e3b7fabcba233246ec862758a29.tar.gz | |
* nsterm.m (x_free_frame_resources):
* term.c (tty_free_frame_resources):
* xterm.c (x_free_frame_resources): Do not check for non-NULL
face cache because it's implied by free_frame_faces anyway.
* w32term.c (x_free_frame_resources): Likewise. Do not call
free_frame_faces twice.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/term.c b/src/term.c index 85a994bf2bc..7b6cb41e23d 100644 --- a/src/term.c +++ b/src/term.c @@ -3833,10 +3833,7 @@ static void tty_free_frame_resources (struct frame *f) { eassert (FRAME_TERMCAP_P (f)); - - if (FRAME_FACE_CACHE (f)) - free_frame_faces (f); - + free_frame_faces (f); xfree (f->output_data.tty); } @@ -3848,9 +3845,7 @@ static void tty_free_frame_resources (struct frame *f) { eassert (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)); - - if (FRAME_FACE_CACHE (f)) - free_frame_faces (f); + free_frame_faces (f); } #endif /* MSDOS */ |