diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:09:29 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:09:29 -0700 |
| commit | c3ed7cea0a43ab86c9d3b1627878055844bc8656 (patch) | |
| tree | 4a46db8032e1b359be5284822828d12814d96e27 /src/frame.c | |
| parent | 07fafe1edbba4a5eecbe133313b2eb6ec15e5c55 (diff) | |
| parent | 16e5e8e4ea4ad46157fcdeafb16f245124fba375 (diff) | |
| download | emacs-c3ed7cea0a43ab86c9d3b1627878055844bc8656.tar.gz | |
Merge from origin/emacs-25
16e5e8e Fix last change to isearch-update (bug#23406)
b755d98 Autoload cursor-sensor-inhibit (bug#23406)
b52ebd4 org-map-entries: Fix org-agenda-prepare-buffers call
86aa409 Followup for last commit in the user manual
7004459 Improve doc string of 'set-goal-column'
ccdaf04 Fix the MSDOS build
ffe701c Remove \= from format string (bug#18190)
1c58fa1 Fix variable-pitch font on MS-Windows
c6077bf Restore follow-scroll-up/down to scrolling by the combined si...
b671e21 Revert unneeded change which harms syntactic parsing. This f...
48b24c9 Correct indentation of ids in a C++ enum after a protection k...
5c3534f * lisp/window.el (window--process-window-list): No-op if no p...
734fb3a Port dumping to NetBSD with PaX
0255a70 Don't mistake `for' inside a function for a part of array com...
# Conflicts:
# src/Makefile.in
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/frame.c b/src/frame.c index 9c8926c42c7..1c5c12c7e29 100644 --- a/src/frame.c +++ b/src/frame.c @@ -509,10 +509,13 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit, block_input (); #ifdef MSDOS - /* We only can set screen dimensions to certain values supported - by our video hardware. Try to find the smallest size greater - or equal to the requested dimensions. */ - dos_set_window_size (&new_lines, &new_cols); + /* We only can set screen dimensions to certain values supported by + our video hardware. Try to find the smallest size greater or + equal to the requested dimensions, while accounting for the fact + that the menu-bar lines are not counted in the frame height. */ + int dos_new_lines = new_lines + FRAME_TOP_MARGIN (f); + dos_set_window_size (&dos_new_lines, &new_cols); + new_lines = dos_new_lines - FRAME_TOP_MARGIN (f); #endif if (new_windows_width != old_windows_width) |