diff options
| author | Dmitry Antipov | 2014-07-23 20:09:34 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-07-23 20:09:34 +0400 |
| commit | 5fc3a9f5162ca6d8cd70586802e83e1a2c3cfdb0 (patch) | |
| tree | 01cea0155b62fd49154b703d9e92d24877e22047 /src/frame.c | |
| parent | 0df1c7293ee5a4715879ec8bf92585fa050085ea (diff) | |
| download | emacs-5fc3a9f5162ca6d8cd70586802e83e1a2c3cfdb0.tar.gz emacs-5fc3a9f5162ca6d8cd70586802e83e1a2c3cfdb0.zip | |
* frame.c (Fset_frame_height): Take frame top margin into account.
Incorrect behavior was reported by Martin Rudalics <rudalics@gmx.at> in
<http://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00258.html>
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c index 731a62705bd..e68a3db24ea 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -2584,8 +2584,9 @@ FRAME should be HEIGHT pixels high. */) | |||
| 2584 | { | 2584 | { |
| 2585 | if (NILP (pixelwise)) | 2585 | if (NILP (pixelwise)) |
| 2586 | { | 2586 | { |
| 2587 | if (XINT (height) != FRAME_LINES (f)) | 2587 | if (FRAME_LINES (f) - FRAME_TOP_MARGIN (f) != XINT (height)) |
| 2588 | x_set_window_size (f, 1, FRAME_COLS (f), XINT (height), 0); | 2588 | x_set_window_size (f, 1, FRAME_COLS (f), |
| 2589 | XINT (height) + FRAME_TOP_MARGIN (f), 0); | ||
| 2589 | 2590 | ||
| 2590 | do_pending_window_change (0); | 2591 | do_pending_window_change (0); |
| 2591 | } | 2592 | } |