diff options
| author | Eli Zaretskii | 2013-12-11 19:06:29 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-12-11 19:06:29 +0200 |
| commit | a34a8cd1e46594c5776f187dd98583bcb82f9bc0 (patch) | |
| tree | 92503ed7f7d3fb3c73c38d4689611b8202682970 /src/window.c | |
| parent | 8b55eeeb70be4b4ff3dd4694013bdb1a9f668bc6 (diff) | |
| parent | 1421be8445803bdb9c3fece8c658836b5f0f9c34 (diff) | |
| download | emacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.tar.gz emacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.zip | |
Merge from trunk.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 426edc6099c..9bf6ad4b8f3 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -4057,7 +4057,7 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise) | |||
| 4057 | r->pixel_top = FRAME_TOP_MARGIN_HEIGHT (f); | 4057 | r->pixel_top = FRAME_TOP_MARGIN_HEIGHT (f); |
| 4058 | 4058 | ||
| 4059 | if (new_pixel_size == old_pixel_size) | 4059 | if (new_pixel_size == old_pixel_size) |
| 4060 | return; | 4060 | ; |
| 4061 | else if (WINDOW_LEAF_P (r)) | 4061 | else if (WINDOW_LEAF_P (r)) |
| 4062 | /* For a leaf root window just set the size. */ | 4062 | /* For a leaf root window just set the size. */ |
| 4063 | if (horflag) | 4063 | if (horflag) |