diff options
| author | Chong Yidong | 2010-07-10 13:58:29 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-07-10 13:58:29 -0400 |
| commit | 7c33a0572280bdcf0583c5625cfda32f63fad56d (patch) | |
| tree | 24567629c9a942f6a31f692de5699cfc65282221 /src | |
| parent | 4565b08e186d740b61d073d12ed4d59f912e7048 (diff) | |
| download | emacs-7c33a0572280bdcf0583c5625cfda32f63fad56d.tar.gz emacs-7c33a0572280bdcf0583c5625cfda32f63fad56d.zip | |
* xfaces.c (realize_face): Garbage the frame if a face is removed
(Bug#6593).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfaces.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9ca8ac29dd8..b6fe8f8c5c3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-07-10 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * xfaces.c (realize_face): Garbage the frame if a face is removed | ||
| 4 | (Bug#6593). | ||
| 5 | |||
| 1 | 2010-07-05 Andreas Schwab <schwab@linux-m68k.org> | 6 | 2010-07-05 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 7 | ||
| 3 | * keyboard.c: Remove duplicate <setjmp.h>. | 8 | * keyboard.c: Remove duplicate <setjmp.h>. |
diff --git a/src/xfaces.c b/src/xfaces.c index 6bde1c121d2..7dab1a871d1 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -5783,6 +5783,7 @@ realize_face (cache, attrs, former_face_id) | |||
| 5783 | struct face *former_face = cache->faces_by_id[former_face_id]; | 5783 | struct face *former_face = cache->faces_by_id[former_face_id]; |
| 5784 | uncache_face (cache, former_face); | 5784 | uncache_face (cache, former_face); |
| 5785 | free_realized_face (cache->f, former_face); | 5785 | free_realized_face (cache->f, former_face); |
| 5786 | SET_FRAME_GARBAGED (cache->f); | ||
| 5786 | } | 5787 | } |
| 5787 | 5788 | ||
| 5788 | if (FRAME_WINDOW_P (cache->f)) | 5789 | if (FRAME_WINDOW_P (cache->f)) |