diff options
| author | Gerd Moellmann | 2000-10-31 12:53:56 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-10-31 12:53:56 +0000 |
| commit | e85ee976fe1a85fbd4adda3d6f168e0bf1c6cc16 (patch) | |
| tree | 0f6aedc57245de0ec701ab6491e4a4c4b523b8e8 | |
| parent | 01b220b61ab1e1790b998a7e7a75a03cd0ef4188 (diff) | |
| download | emacs-e85ee976fe1a85fbd4adda3d6f168e0bf1c6cc16.tar.gz emacs-e85ee976fe1a85fbd4adda3d6f168e0bf1c6cc16.zip | |
(redisplay_tool_bar): Don't set fonts_changed_p if
window height hasn't changed.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a1730161457..023fa5eb891 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2000-10-31 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (redisplay_tool_bar): Don't set fonts_changed_p if | ||
| 4 | window height hasn't changed. | ||
| 5 | |||
| 1 | 2000-10-31 Jason Rumney <jasonr@gnu.org> | 6 | 2000-10-31 Jason Rumney <jasonr@gnu.org> |
| 2 | 7 | ||
| 3 | * w32term.c (x_produce_glyphs): Handle composite characters. | 8 | * w32term.c (x_produce_glyphs): Handle composite characters. |
diff --git a/src/xdisp.c b/src/xdisp.c index ce6f5000927..d5b16ec571a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -7273,6 +7273,7 @@ redisplay_tool_bar (f) | |||
| 7273 | { | 7273 | { |
| 7274 | extern Lisp_Object Qtool_bar_lines; | 7274 | extern Lisp_Object Qtool_bar_lines; |
| 7275 | Lisp_Object frame; | 7275 | Lisp_Object frame; |
| 7276 | int old_height = XFASTINT (w->height); | ||
| 7276 | 7277 | ||
| 7277 | XSETFRAME (frame, f); | 7278 | XSETFRAME (frame, f); |
| 7278 | clear_glyph_matrix (w->desired_matrix); | 7279 | clear_glyph_matrix (w->desired_matrix); |
| @@ -7280,7 +7281,8 @@ redisplay_tool_bar (f) | |||
| 7280 | Fcons (Fcons (Qtool_bar_lines, | 7281 | Fcons (Fcons (Qtool_bar_lines, |
| 7281 | make_number (nlines)), | 7282 | make_number (nlines)), |
| 7282 | Qnil)); | 7283 | Qnil)); |
| 7283 | fonts_changed_p = 1; | 7284 | if (XFASTINT (w->height) != old_height) |
| 7285 | fonts_changed_p = 1; | ||
| 7284 | } | 7286 | } |
| 7285 | } | 7287 | } |
| 7286 | 7288 | ||