Skip to content

Commit ad0e4f9

Browse files
committed
Fix Vim breaking guioption 'k' initialization for non-GTK
Recent Vim change (8.1.0626) broke Vim GUI initialization if guioption 'k' is set, by passing the wrong value to the mustset parameter. Patch around it by making it initialize with the right one in MacVim.
1 parent 1a344ac commit ad0e4f9

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

src/gui.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,11 +687,17 @@ gui_init(void)
687687
gui.shell_created = TRUE;
688688

689689
#ifndef FEAT_GUI_GTK
690+
#ifdef FEAT_GUI_MACVIM
691+
// The below code setting gui_set_shellsize breaks guioption-k, so patching
692+
// around it here by passing TRUE to muset.
693+
gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
694+
#else
690695
// Set the shell size, adjusted for the screen size. For GTK this only
691696
// works after the shell has been opened, thus it is further down.
692697
// For MS-Windows pass FALSE for "mustset" to make --windowid work.
693698
gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
694699
#endif
700+
#endif
695701
#if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU)
696702
/* Need to set the size of the menubar after all the menus have been
697703
* created. */

0 commit comments

Comments
 (0)