diff options
| author | Martin Rudalics | 2013-12-08 10:56:02 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2013-12-08 10:56:02 +0100 |
| commit | acfe46025afa0f3ba1398b675de6da6ad0e3460e (patch) | |
| tree | d28a64a8bcdd9bcb045e498a8cf6540fcc297900 /src | |
| parent | 974ebc9ccfaafea7cda98d6a4bb4f63d1fa303fb (diff) | |
| download | emacs-acfe46025afa0f3ba1398b675de6da6ad0e3460e.tar.gz emacs-acfe46025afa0f3ba1398b675de6da6ad0e3460e.zip | |
In x_set_font mark frame as garbaged (Bug#16028).
* frame.c (x_set_font): Mark frame as garbaged (Bug#16028).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/frame.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1eba6bb71c4..02be1e9bd64 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-12-08 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * frame.c (x_set_font): Mark frame as garbaged (Bug#16028). | ||
| 4 | |||
| 1 | 2013-12-08 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-12-08 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Use libcrypto's checksum implementations if available, for speed. | 7 | Use libcrypto's checksum implementations if available, for speed. |
diff --git a/src/frame.c b/src/frame.c index 03bdf696c47..e13c3768e12 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -3314,9 +3314,13 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval) | |||
| 3314 | #endif | 3314 | #endif |
| 3315 | /* Recalculate toolbar height. */ | 3315 | /* Recalculate toolbar height. */ |
| 3316 | f->n_tool_bar_rows = 0; | 3316 | f->n_tool_bar_rows = 0; |
| 3317 | |||
| 3317 | /* Ensure we redraw it. */ | 3318 | /* Ensure we redraw it. */ |
| 3318 | clear_current_matrices (f); | 3319 | clear_current_matrices (f); |
| 3319 | 3320 | ||
| 3321 | /* Attempt to hunt down bug#16028. */ | ||
| 3322 | SET_FRAME_GARBAGED (f); | ||
| 3323 | |||
| 3320 | recompute_basic_faces (f); | 3324 | recompute_basic_faces (f); |
| 3321 | 3325 | ||
| 3322 | do_pending_window_change (0); | 3326 | do_pending_window_change (0); |