diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/frame.c | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8acca6cca3f..e8fa72caea0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,9 +1,14 @@ +2015-03-04 Martin Rudalics <rudalics@gmx.at> + + * frame.c (x_set_font): Try to keep frame height and width + unchanged if tool bar size changes with new font. + 2015-03-03 Eli Zaretskii <eliz@gnu.org> * search.c (find_newline): Avoid assertion violations in CHAR_TO_BYTE when a portion of the buffer was deleted and we look for newlines near the end of the buffer. This happens in Rmail - hen JIT font-lock fontifies a newly displayed portion of the + when JIT font-lock fontifies a newly displayed portion of the buffer. 2015-03-03 Eli Zaretskii <eliz@gnu.org> diff --git a/src/frame.c b/src/frame.c index bac2b246ad9..aa07219d152 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3626,6 +3626,7 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval) #endif /* Recalculate toolbar height. */ f->n_tool_bar_rows = 0; + f->tool_bar_redisplayed_once = false; /* Ensure we redraw it. */ clear_current_matrices (f); |