To: vim_dev@googlegroups.com Subject: Patch 7.4.1611 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1611 Problem: The versplit feature makes the code uneccessary complicated. Solution: Remove FEAT_VERTSPLIT, always support vertical splits when FEAT_WINDOWS is defined. Files: src/buffer.c, src/charset.c, src/eval.c, src/ex_cmds.c, src/ex_docmd.c, src/ex_getln.c, src/gui.c, src/if_lua.c, src/if_mzsch.c, src/if_ruby.c, src/main.c, src/misc1.c, src/misc2.c, src/move.c, src/normal.c, src/option.c, src/quickfix.c, src/screen.c, src/syntax.c, src/term.c, src/ui.c, src/window.c, src/globals.h, src/gui.h, src/if_py_both.h, src/option.h, src/structs.h, src/term.h src/feature.h, src/vim.h, src/version.c *** ../vim-7.4.1610/src/buffer.c 2016-03-15 15:09:25.225513841 +0100 --- src/buffer.c 2016-03-19 21:19:56.773661164 +0100 *************** *** 4607,4615 **** old_curwin = curwin; old_curtab = curtab; ! #ifdef FEAT_GUI need_mouse_correct = TRUE; ! #endif /* * Try closing all windows that are not in the argument list. --- 4607,4615 ---- old_curwin = curwin; old_curtab = curtab; ! # ifdef FEAT_GUI need_mouse_correct = TRUE; ! # endif /* * Try closing all windows that are not in the argument list. *************** *** 4629,4638 **** buf = wp->w_buffer; if (buf->b_ffname == NULL || (!keep_tabs && buf->b_nwindows > 1) ! #ifdef FEAT_VERTSPLIT ! || wp->w_width != Columns ! #endif ! ) i = opened_len; else { --- 4629,4635 ---- buf = wp->w_buffer; if (buf->b_ffname == NULL || (!keep_tabs && buf->b_nwindows > 1) ! || wp->w_width != Columns) i = opened_len; else { *************** *** 4901,4913 **** { wpnext = wp->w_next; if ((wp->w_buffer->b_nwindows > 1 ! #ifdef FEAT_VERTSPLIT || ((cmdmod.split & WSP_VERT) ? wp->w_height + wp->w_status_height < Rows - p_ch - tabline_height() : wp->w_width != Columns) - #endif - #ifdef FEAT_WINDOWS || (had_tab > 0 && wp != firstwin) #endif ) && firstwin != lastwin --- 4898,4908 ---- { wpnext = wp->w_next; if ((wp->w_buffer->b_nwindows > 1 ! #ifdef FEAT_WINDOWS || ((cmdmod.split & WSP_VERT) ? wp->w_height + wp->w_status_height < Rows - p_ch - tabline_height() : wp->w_width != Columns) || (had_tab > 0 && wp != firstwin) #endif ) && firstwin != lastwin *** ../vim-7.4.1610/src/charset.c 2016-02-27 18:13:05.220593278 +0100 --- src/charset.c 2016-03-19 21:21:17.916807662 +0100 *************** *** 1093,1099 **** && vim_isbreak(c) && !vim_isbreak(s[1]) && wp->w_p_wrap ! # ifdef FEAT_VERTSPLIT && wp->w_width != 0 # endif ) --- 1093,1099 ---- && vim_isbreak(c) && !vim_isbreak(s[1]) && wp->w_p_wrap ! # ifdef FEAT_WINDOWS && wp->w_width != 0 # endif ) *************** *** 1250,1259 **** int width1; /* width of first line (after line number) */ int width2; /* width of further lines */ ! #ifdef FEAT_VERTSPLIT if (wp->w_width == 0) /* there is no border */ return FALSE; ! #endif width1 = W_WIDTH(wp) - win_col_off(wp); if ((int)vcol < width1 - 1) return FALSE; --- 1250,1259 ---- int width1; /* width of first line (after line number) */ int width2; /* width of further lines */ ! # ifdef FEAT_WINDOWS if (wp->w_width == 0) /* there is no border */ return FALSE; ! # endif width1 = W_WIDTH(wp) - win_col_off(wp); if ((int)vcol < width1 - 1) return FALSE; *** ../vim-7.4.1610/src/eval.c 2016-03-19 20:05:38.076396257 +0100 --- src/eval.c 2016-03-19 21:22:31.224036624 +0100 *************** *** 13734,13740 **** #ifdef FEAT_VIMINFO "viminfo", #endif ! #ifdef FEAT_VERTSPLIT "vertsplit", #endif #ifdef FEAT_VIRTUALEDIT --- 13734,13740 ---- #ifdef FEAT_VIMINFO "viminfo", #endif ! #ifdef FEAT_WINDOWS "vertsplit", #endif #ifdef FEAT_VIRTUALEDIT *************** *** 20646,20655 **** { sprintf((char *)buf, "%dresize %d|", winnr, wp->w_height); ga_concat(&ga, buf); - # ifdef FEAT_VERTSPLIT sprintf((char *)buf, "vert %dresize %d|", winnr, wp->w_width); ga_concat(&ga, buf); - # endif ++winnr; } ga_append(&ga, NUL); --- 20646,20653 ---- *************** *** 20701,20707 **** check_cursor(); win_new_height(curwin, curwin->w_height); ! # ifdef FEAT_VERTSPLIT win_new_width(curwin, W_WIDTH(curwin)); # endif changed_window_setting(); --- 20699,20705 ---- check_cursor(); win_new_height(curwin, curwin->w_height); ! # ifdef FEAT_WINDOWS win_new_width(curwin, W_WIDTH(curwin)); # endif changed_window_setting(); *************** *** 20756,20762 **** if (wp == NULL) rettv->vval.v_number = -1; else ! #ifdef FEAT_VERTSPLIT rettv->vval.v_number = wp->w_width; #else rettv->vval.v_number = Columns; --- 20754,20760 ---- if (wp == NULL) rettv->vval.v_number = -1; else ! #ifdef FEAT_WINDOWS rettv->vval.v_number = wp->w_width; #else rettv->vval.v_number = Columns; *** ../vim-7.4.1610/src/ex_cmds.c 2016-03-15 18:23:50.464921252 +0100 --- src/ex_cmds.c 2016-03-19 21:22:40.179942429 +0100 *************** *** 5867,5877 **** * specified, the current window is vertically split and * narrow. */ n = WSP_HELP; - # ifdef FEAT_VERTSPLIT if (cmdmod.split == 0 && curwin->w_width != Columns && curwin->w_width < 80) n |= WSP_TOP; - # endif if (win_split(0, n) == FAIL) goto erret; #else --- 5867,5875 ---- *** ../vim-7.4.1610/src/ex_docmd.c 2016-03-15 23:10:26.408712137 +0100 --- src/ex_docmd.c 2016-03-19 21:25:04.870420713 +0100 *************** *** 2013,2019 **** case 'v': if (checkforcmd(&ea.cmd, "vertical", 4)) { ! #ifdef FEAT_VERTSPLIT cmdmod.split |= WSP_VERT; #endif continue; --- 2013,2019 ---- case 'v': if (checkforcmd(&ea.cmd, "vertical", 4)) { ! #ifdef FEAT_WINDOWS cmdmod.split |= WSP_VERT; #endif continue; *************** *** 7923,7936 **** int browse_flag = cmdmod.browse; # endif - # ifndef FEAT_VERTSPLIT - if (eap->cmdidx == CMD_vsplit || eap->cmdidx == CMD_vnew) - { - ex_ni(eap); - return; - } - # endif - # ifdef FEAT_GUI need_mouse_correct = TRUE; # endif --- 7923,7928 ---- *************** *** 7942,7951 **** { if (eap->cmdidx == CMD_split) eap->cmdidx = CMD_new; - # ifdef FEAT_VERTSPLIT if (eap->cmdidx == CMD_vsplit) eap->cmdidx = CMD_vnew; - # endif } # endif --- 7934,7941 ---- *************** *** 7964,7972 **** # endif # ifdef FEAT_BROWSE if (cmdmod.browse - # ifdef FEAT_VERTSPLIT && eap->cmdidx != CMD_vnew - # endif && eap->cmdidx != CMD_new) { # ifdef FEAT_AUTOCMD --- 7954,7960 ---- *************** *** 8224,8234 **** ; } ! #ifdef FEAT_GUI need_mouse_correct = TRUE; ! #endif n = atol((char *)eap->arg); - #ifdef FEAT_VERTSPLIT if (cmdmod.split & WSP_VERT) { if (*eap->arg == '-' || *eap->arg == '+') --- 8212,8221 ---- ; } ! # ifdef FEAT_GUI need_mouse_correct = TRUE; ! # endif n = atol((char *)eap->arg); if (cmdmod.split & WSP_VERT) { if (*eap->arg == '-' || *eap->arg == '+') *************** *** 8238,8244 **** win_setwidth_win((int)n, wp); } else - #endif { if (*eap->arg == '-' || *eap->arg == '+') n += curwin->w_height; --- 8225,8230 ---- *************** *** 8397,8403 **** if ((eap->cmdidx == CMD_new || eap->cmdidx == CMD_tabnew || eap->cmdidx == CMD_tabedit ! #ifdef FEAT_VERTSPLIT || eap->cmdidx == CMD_vnew #endif ) && *eap->arg == NUL) --- 8383,8389 ---- if ((eap->cmdidx == CMD_new || eap->cmdidx == CMD_tabnew || eap->cmdidx == CMD_tabedit ! #ifdef FEAT_WINDOWS || eap->cmdidx == CMD_vnew #endif ) && *eap->arg == NUL) *************** *** 8409,8415 **** old_curwin == NULL ? curwin : NULL); } else if ((eap->cmdidx != CMD_split ! #ifdef FEAT_VERTSPLIT && eap->cmdidx != CMD_vsplit #endif ) --- 8395,8401 ---- old_curwin == NULL ? curwin : NULL); } else if ((eap->cmdidx != CMD_split ! #ifdef FEAT_WINDOWS && eap->cmdidx != CMD_vsplit #endif ) *** ../vim-7.4.1610/src/ex_getln.c 2016-03-13 13:24:38.968183573 +0100 --- src/ex_getln.c 2016-03-19 22:05:03.409019166 +0100 *************** *** 500,510 **** } else { - # ifdef FEAT_VERTSPLIT win_redraw_last_status(topframe); - # else - lastwin->w_redr_status = TRUE; - # endif redraw_statuslines(); } KeyTyped = skt; --- 500,506 ---- *** ../vim-7.4.1610/src/gui.c 2016-03-19 14:48:26.943690257 +0100 --- src/gui.c 2016-03-19 21:28:12.928443116 +0100 *************** *** 1812,1818 **** gui.scroll_region_bot = arg1; } break; ! #ifdef FEAT_VERTSPLIT case 'V': /* Set vertical scroll region */ if (arg1 < arg2) { --- 1812,1818 ---- gui.scroll_region_bot = arg1; } break; ! #ifdef FEAT_WINDOWS case 'V': /* Set vertical scroll region */ if (arg1 < arg2) { *************** *** 3128,3134 **** && button != MOUSE_DRAG # ifdef FEAT_MOUSESHAPE && !drag_status_line ! # ifdef FEAT_VERTSPLIT && !drag_sep_line # endif # endif --- 3128,3134 ---- && button != MOUSE_DRAG # ifdef FEAT_MOUSESHAPE && !drag_status_line ! # ifdef FEAT_WINDOWS && !drag_sep_line # endif # endif *************** *** 3406,3412 **** case GO_RIGHT: gui.which_scrollbars[SBAR_RIGHT] = TRUE; break; ! #ifdef FEAT_VERTSPLIT case GO_VLEFT: if (win_hasvertsplit()) gui.which_scrollbars[SBAR_LEFT] = TRUE; --- 3406,3412 ---- case GO_RIGHT: gui.which_scrollbars[SBAR_RIGHT] = TRUE; break; ! #ifdef FEAT_WINDOWS case GO_VLEFT: if (win_hasvertsplit()) gui.which_scrollbars[SBAR_LEFT] = TRUE; *************** *** 3839,3845 **** sb->max = 1; sb->top = 0; sb->height = 0; ! #ifdef FEAT_VERTSPLIT sb->width = 0; #endif sb->status_height = 0; --- 3839,3845 ---- sb->max = 1; sb->top = 0; sb->height = 0; ! #ifdef FEAT_WINDOWS sb->width = 0; #endif sb->status_height = 0; *************** *** 4121,4127 **** long val, size, max; /* need 32 bits here */ int which_sb; int h, y; ! #ifdef FEAT_VERTSPLIT static win_T *prev_curwin = NULL; #endif --- 4121,4127 ---- long val, size, max; /* need 32 bits here */ int which_sb; int h, y; ! #ifdef FEAT_WINDOWS static win_T *prev_curwin = NULL; #endif *************** *** 4219,4228 **** #ifdef FEAT_WINDOWS || sb->top != wp->w_winrow || sb->status_height != wp->w_status_height - # ifdef FEAT_VERTSPLIT || sb->width != wp->w_width || prev_curwin != curwin - # endif #endif ) { --- 4219,4226 ---- *************** *** 4232,4240 **** #ifdef FEAT_WINDOWS sb->top = wp->w_winrow; sb->status_height = wp->w_status_height; - # ifdef FEAT_VERTSPLIT sb->width = wp->w_width; - # endif #endif /* Calculate height and position in pixels */ --- 4230,4236 ---- *************** *** 4316,4322 **** val, size, max); } } ! #ifdef FEAT_VERTSPLIT prev_curwin = curwin; #endif --hold_gui_events; --- 4312,4318 ---- val, size, max); } } ! #ifdef FEAT_WINDOWS prev_curwin = curwin; #endif --hold_gui_events; *************** *** 4333,4339 **** int which, /* SBAR_LEFT or SBAR_RIGHT */ int enable) /* TRUE to enable scrollbar */ { ! #ifdef FEAT_VERTSPLIT int midcol = curwin->w_wincol + curwin->w_width / 2; int has_midcol = (wp->w_wincol <= midcol && wp->w_wincol + wp->w_width >= midcol); --- 4329,4335 ---- int which, /* SBAR_LEFT or SBAR_RIGHT */ int enable) /* TRUE to enable scrollbar */ { ! #ifdef FEAT_WINDOWS int midcol = curwin->w_wincol + curwin->w_width / 2; int has_midcol = (wp->w_wincol <= midcol && wp->w_wincol + wp->w_width >= midcol); *************** *** 4857,4863 **** st[2] = KE_FILLER; st[3] = (char_u)MOUSE_LEFT; fill_mouse_coord(st + 4, ! #ifdef FEAT_VERTSPLIT wp->w_wincol == 0 ? -1 : wp->w_wincol + MOUSE_COLOFF, #else -1, --- 4853,4859 ---- st[2] = KE_FILLER; st[3] = (char_u)MOUSE_LEFT; fill_mouse_coord(st + 4, ! #ifdef FEAT_WINDOWS wp->w_wincol == 0 ? -1 : wp->w_wincol + MOUSE_COLOFF, #else -1, *************** *** 4934,4944 **** } else if (row > wp->w_height) /* below status line */ update_mouseshape(SHAPE_IDX_CLINE); - # ifdef FEAT_VERTSPLIT else if (!(State & CMDLINE) && W_VSEP_WIDTH(wp) > 0 && col == wp->w_width && (row != wp->w_height || !stl_connected(wp)) && msg_scrolled == 0) update_mouseshape(SHAPE_IDX_VSEP); - # endif else if (!(State & CMDLINE) && W_STATUS_HEIGHT(wp) > 0 && row == wp->w_height && msg_scrolled == 0) update_mouseshape(SHAPE_IDX_STATUS); --- 4930,4938 ---- *** ../vim-7.4.1610/src/if_lua.c 2016-01-23 19:45:48.618931375 +0100 --- src/if_lua.c 2016-03-19 21:28:46.320091998 +0100 *************** *** 1177,1183 **** lua_pushinteger(L, w->w_cursor.lnum); else if (strncmp(s, "col", 3) == 0) lua_pushinteger(L, w->w_cursor.col + 1); ! #ifdef FEAT_VERTSPLIT else if (strncmp(s, "width", 5) == 0) lua_pushinteger(L, W_WIDTH(w)); #endif --- 1177,1183 ---- lua_pushinteger(L, w->w_cursor.lnum); else if (strncmp(s, "col", 3) == 0) lua_pushinteger(L, w->w_cursor.col + 1); ! #ifdef FEAT_WINDOWS else if (strncmp(s, "width", 5) == 0) lua_pushinteger(L, W_WIDTH(w)); #endif *************** *** 1220,1226 **** w->w_cursor.col = v - 1; update_screen(VALID); } ! #ifdef FEAT_VERTSPLIT else if (strncmp(s, "width", 5) == 0) { win_T *win = curwin; --- 1220,1226 ---- w->w_cursor.col = v - 1; update_screen(VALID); } ! #ifdef FEAT_WINDOWS else if (strncmp(s, "width", 5) == 0) { win_T *win = curwin; *** ../vim-7.4.1610/src/if_mzsch.c 2016-02-23 17:13:56.885032246 +0100 --- src/if_mzsch.c 2016-03-19 21:29:18.955748837 +0100 *************** *** 145,151 **** static Scheme_Object *get_window_buffer(void *, int, Scheme_Object **); static Scheme_Object *get_window_height(void *, int, Scheme_Object **); static Scheme_Object *set_window_height(void *, int, Scheme_Object **); ! #ifdef FEAT_VERTSPLIT static Scheme_Object *get_window_width(void *, int, Scheme_Object **); static Scheme_Object *set_window_width(void *, int, Scheme_Object **); #endif --- 145,151 ---- static Scheme_Object *get_window_buffer(void *, int, Scheme_Object **); static Scheme_Object *get_window_height(void *, int, Scheme_Object **); static Scheme_Object *set_window_height(void *, int, Scheme_Object **); ! #ifdef FEAT_WINDOWS static Scheme_Object *get_window_width(void *, int, Scheme_Object **); static Scheme_Object *set_window_width(void *, int, Scheme_Object **); #endif *************** *** 2066,2072 **** return scheme_void; } ! #ifdef FEAT_VERTSPLIT /* (get-win-width [window]) */ static Scheme_Object * get_window_width(void *data, int argc, Scheme_Object **argv) --- 2066,2072 ---- return scheme_void; } ! #ifdef FEAT_WINDOWS /* (get-win-width [window]) */ static Scheme_Object * get_window_width(void *data, int argc, Scheme_Object **argv) *************** *** 3718,3724 **** {get_window_buffer, "get-win-buffer", 0, 1}, {get_window_height, "get-win-height", 0, 1}, {set_window_height, "set-win-height", 1, 2}, ! #ifdef FEAT_VERTSPLIT {get_window_width, "get-win-width", 0, 1}, {set_window_width, "set-win-width", 1, 2}, #endif --- 3718,3724 ---- {get_window_buffer, "get-win-buffer", 0, 1}, {get_window_height, "get-win-height", 0, 1}, {set_window_height, "set-win-height", 1, 2}, ! #ifdef FEAT_WINDOWS {get_window_width, "get-win-width", 0, 1}, {set_window_width, "set-win-width", 1, 2}, #endif *** ../vim-7.4.1610/src/if_ruby.c 2016-02-16 15:06:54.661635316 +0100 --- src/if_ruby.c 2016-03-19 21:29:26.119673510 +0100 *************** *** 1449,1455 **** static VALUE window_set_width(VALUE self UNUSED, VALUE width) { ! #ifdef FEAT_VERTSPLIT win_T *win = get_win(self); win_T *savewin = curwin; --- 1449,1455 ---- static VALUE window_set_width(VALUE self UNUSED, VALUE width) { ! #ifdef FEAT_WINDOWS win_T *win = get_win(self); win_T *savewin = curwin; *** ../vim-7.4.1610/src/main.c 2016-03-19 14:48:26.939690299 +0100 --- src/main.c 2016-03-19 21:29:50.847413505 +0100 *************** *** 2088,2094 **** break; case 'O': /* "-O[N]" open N vertical split windows */ ! #if defined(FEAT_VERTSPLIT) && defined(FEAT_WINDOWS) /* default is 0: open window for each file */ parmp->window_count = get_number_arg((char_u *)argv[0], &argv_idx, 0); --- 2088,2094 ---- break; case 'O': /* "-O[N]" open N vertical split windows */ ! #ifdef FEAT_WINDOWS /* default is 0: open window for each file */ parmp->window_count = get_number_arg((char_u *)argv[0], &argv_idx, 0); *** ../vim-7.4.1610/src/misc1.c 2016-02-23 14:52:31.885232171 +0100 --- src/misc1.c 2016-03-19 21:30:18.063127346 +0100 *************** *** 1976,1982 **** if (!wp->w_p_wrap) return 1; ! #ifdef FEAT_VERTSPLIT if (wp->w_width == 0) return 1; #endif --- 1976,1982 ---- if (!wp->w_p_wrap) return 1; ! #ifdef FEAT_WINDOWS if (wp->w_width == 0) return 1; #endif *************** *** 2052,2058 **** if (!wp->w_p_wrap) return lines + 1; ! #ifdef FEAT_VERTSPLIT if (wp->w_width == 0) return lines + 1; #endif --- 2052,2058 ---- if (!wp->w_p_wrap) return lines + 1; ! #ifdef FEAT_WINDOWS if (wp->w_width == 0) return lines + 1; #endif *** ../vim-7.4.1610/src/misc2.c 2016-03-11 22:52:00.738438072 +0100 --- src/misc2.c 2016-03-19 21:30:52.818761914 +0100 *************** *** 169,175 **** if (finetune && curwin->w_p_wrap ! # ifdef FEAT_VERTSPLIT && curwin->w_width != 0 # endif && wcol >= (colnr_T)width) --- 169,175 ---- if (finetune && curwin->w_p_wrap ! # ifdef FEAT_WINDOWS && curwin->w_width != 0 # endif && wcol >= (colnr_T)width) *************** *** 3633,3639 **** } if (mouse && drag_status_line) return SHAPE_IDX_SDRAG; ! # ifdef FEAT_VERTSPLIT if (mouse && drag_sep_line) return SHAPE_IDX_VDRAG; # endif --- 3633,3639 ---- } if (mouse && drag_status_line) return SHAPE_IDX_SDRAG; ! # ifdef FEAT_WINDOWS if (mouse && drag_sep_line) return SHAPE_IDX_VDRAG; # endif *** ../vim-7.4.1610/src/move.c 2016-01-30 19:39:45.277838615 +0100 --- src/move.c 2016-03-19 21:31:48.762173724 +0100 *************** *** 990,996 **** curwin->w_wrow = curwin->w_height - 1; } else if (curwin->w_p_wrap ! #ifdef FEAT_VERTSPLIT && curwin->w_width != 0 #endif ) --- 990,996 ---- curwin->w_wrow = curwin->w_height - 1; } else if (curwin->w_p_wrap ! #ifdef FEAT_WINDOWS && curwin->w_width != 0 #endif ) *************** *** 1096,1102 **** && curwin->w_height != 0 && curwin->w_cursor.lnum == curwin->w_topline && width > 0 ! #ifdef FEAT_VERTSPLIT && curwin->w_width != 0 #endif ) --- 1096,1102 ---- && curwin->w_height != 0 && curwin->w_cursor.lnum == curwin->w_topline && width > 0 ! #ifdef FEAT_WINDOWS && curwin->w_width != 0 #endif ) *************** *** 1259,1265 **** */ wrow = curwin->w_wrow; if (curwin->w_p_wrap ! #ifdef FEAT_VERTSPLIT && curwin->w_width != 0 #endif ) --- 1259,1265 ---- */ wrow = curwin->w_wrow; if (curwin->w_p_wrap ! #ifdef FEAT_WINDOWS && curwin->w_width != 0 #endif ) *************** *** 1468,1474 **** end_row += plines(curwin->w_topline - 1); #endif if (curwin->w_p_wrap ! #ifdef FEAT_VERTSPLIT && curwin->w_width != 0 #endif ) --- 1468,1474 ---- end_row += plines(curwin->w_topline - 1); #endif if (curwin->w_p_wrap ! #ifdef FEAT_WINDOWS && curwin->w_width != 0 #endif ) *************** *** 1532,1538 **** start_row = curwin->w_wrow - plines(curwin->w_topline); #endif if (curwin->w_p_wrap ! #ifdef FEAT_VERTSPLIT && curwin->w_width != 0 #endif ) --- 1532,1538 ---- start_row = curwin->w_wrow - plines(curwin->w_topline); #endif if (curwin->w_p_wrap ! #ifdef FEAT_WINDOWS && curwin->w_width != 0 #endif ) *** ../vim-7.4.1610/src/normal.c 2016-03-08 14:44:28.192510661 +0100 --- src/normal.c 2016-03-19 21:33:39.553008925 +0100 *************** *** 2306,2313 **** int in_status_line; /* mouse in status line */ #ifdef FEAT_WINDOWS static int in_tab_line = FALSE; /* mouse clicked in tab line */ - #endif - #ifdef FEAT_VERTSPLIT int in_sep_line; /* mouse in vertical separator line */ #endif int c1, c2; --- 2306,2311 ---- *************** *** 2384,2396 **** drag_status_line = FALSE; update_mouseshape(SHAPE_IDX_STATUS); } - # ifdef FEAT_VERTSPLIT if (!is_drag && drag_sep_line) { drag_sep_line = FALSE; update_mouseshape(SHAPE_IDX_VSEP); } - # endif #endif /* --- 2382,2392 ---- *************** *** 2784,2792 **** oap == NULL ? NULL : &(oap->inclusive), which_button); moved = (jump_flags & CURSOR_MOVED); in_status_line = (jump_flags & IN_STATUS_LINE); - #ifdef FEAT_VERTSPLIT in_sep_line = (jump_flags & IN_SEP_LINE); - #endif #ifdef FEAT_NETBEANS_INTG if (isNetbeansBuffer(curbuf) --- 2780,2786 ---- *************** *** 3022,3028 **** } #endif } - #ifdef FEAT_VERTSPLIT else if (in_sep_line) { # ifdef FEAT_MOUSESHAPE --- 3016,3021 ---- *************** *** 3033,3039 **** } # endif } - #endif else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT)) && mouse_has(MOUSE_VISUAL)) { --- 3026,3031 ---- *************** *** 4401,4410 **** if (width2 == 0) width2 = 1; /* avoid divide by zero */ ! #ifdef FEAT_VERTSPLIT if (curwin->w_width != 0) - { #endif /* * Instead of sticking at the last character of the buffer line we * try to stick in the last column of the screen. --- 4393,4402 ---- if (width2 == 0) width2 = 1; /* avoid divide by zero */ ! #ifdef FEAT_WINDOWS if (curwin->w_width != 0) #endif + { /* * Instead of sticking at the last character of the buffer line we * try to stick in the last column of the screen. *************** *** 4491,4499 **** } } } - #ifdef FEAT_VERTSPLIT } - #endif if (virtual_active() && atend) coladvance(MAXCOL); --- 4483,4489 ---- *************** *** 7987,7993 **** oap->motion_type = MCHAR; oap->inclusive = FALSE; if (curwin->w_p_wrap ! #ifdef FEAT_VERTSPLIT && curwin->w_width != 0 #endif ) --- 7977,7983 ---- oap->motion_type = MCHAR; oap->inclusive = FALSE; if (curwin->w_p_wrap ! #ifdef FEAT_WINDOWS && curwin->w_width != 0 #endif ) *************** *** 8054,8060 **** oap->motion_type = MCHAR; oap->inclusive = TRUE; if (curwin->w_p_wrap ! #ifdef FEAT_VERTSPLIT && curwin->w_width != 0 #endif ) --- 8044,8050 ---- oap->motion_type = MCHAR; oap->inclusive = TRUE; if (curwin->w_p_wrap ! #ifdef FEAT_WINDOWS && curwin->w_width != 0 #endif ) *** ../vim-7.4.1610/src/option.c 2016-03-19 18:21:30.326003240 +0100 --- src/option.c 2016-03-19 21:35:25.231897941 +0100 *************** *** 243,250 **** #define PV_UL OPT_BOTH(OPT_BUF(BV_UL)) #ifdef FEAT_WINDOWS # define PV_WFH OPT_WIN(WV_WFH) - #endif - #ifdef FEAT_VERTSPLIT # define PV_WFW OPT_WIN(WV_WFW) #endif #define PV_WRAP OPT_WIN(WV_WRAP) --- 243,248 ---- *************** *** 466,475 **** # define ISP_LATIN1 (char_u *)"@,161-255" #endif ! /* The 16 bit MS-DOS version is low on space, make the string as short as ! * possible when compiling with few features. */ #if defined(FEAT_DIFF) || defined(FEAT_FOLDING) || defined(FEAT_SPELL) \ ! || defined(FEAT_VERTSPLIT) || defined(FEAT_CLIPBOARD) \ || defined(FEAT_INS_EXPAND) || defined(FEAT_SYN_HL) || defined(FEAT_CONCEAL) # define HIGHLIGHT_INIT "8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,N:CursorLineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,-:Conceal,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill,!:CursorColumn,.:CursorLine,o:ColorColumn" #else --- 464,472 ---- # define ISP_LATIN1 (char_u *)"@,161-255" #endif ! /* Make the string as short as possible when compiling with few features. */ #if defined(FEAT_DIFF) || defined(FEAT_FOLDING) || defined(FEAT_SPELL) \ ! || defined(FEAT_WINDOWS) || defined(FEAT_CLIPBOARD) \ || defined(FEAT_INS_EXPAND) || defined(FEAT_SYN_HL) || defined(FEAT_CONCEAL) # define HIGHLIGHT_INIT "8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,N:CursorLineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,-:Conceal,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill,!:CursorColumn,.:CursorLine,o:ColorColumn" #else *************** *** 1040,1046 **** (char_u *)&p_dy, PV_NONE, {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"eadirection", "ead", P_STRING|P_VI_DEF, ! #ifdef FEAT_VERTSPLIT (char_u *)&p_ead, PV_NONE, {(char_u *)"both", (char_u *)0L} #else --- 1037,1043 ---- (char_u *)&p_dy, PV_NONE, {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"eadirection", "ead", P_STRING|P_VI_DEF, ! #ifdef FEAT_WINDOWS (char_u *)&p_ead, PV_NONE, {(char_u *)"both", (char_u *)0L} #else *************** *** 2492,2498 **** #endif {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"splitright", "spr", P_BOOL|P_VI_DEF, ! #ifdef FEAT_VERTSPLIT (char_u *)&p_spr, PV_NONE, #else (char_u *)NULL, PV_NONE, --- 2489,2495 ---- #endif {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"splitright", "spr", P_BOOL|P_VI_DEF, ! #ifdef FEAT_WINDOWS (char_u *)&p_spr, PV_NONE, #else (char_u *)NULL, PV_NONE, *************** *** 2892,2898 **** #endif {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT, ! #ifdef FEAT_VERTSPLIT (char_u *)VAR_WIN, PV_WFW, #else (char_u *)NULL, PV_NONE, --- 2889,2895 ---- #endif {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT, ! #ifdef FEAT_WINDOWS (char_u *)VAR_WIN, PV_WFW, #else (char_u *)NULL, PV_NONE, *************** *** 2906,2919 **** #endif {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"winminwidth", "wmw", P_NUM|P_VI_DEF, ! #ifdef FEAT_VERTSPLIT (char_u *)&p_wmw, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"winwidth", "wiw", P_NUM|P_VI_DEF, ! #ifdef FEAT_VERTSPLIT (char_u *)&p_wiw, PV_NONE, #else (char_u *)NULL, PV_NONE, --- 2903,2916 ---- #endif {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"winminwidth", "wmw", P_NUM|P_VI_DEF, ! #ifdef FEAT_WINDOWS (char_u *)&p_wmw, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"winwidth", "wiw", P_NUM|P_VI_DEF, ! #ifdef FEAT_WINDOWS (char_u *)&p_wiw, PV_NONE, #else (char_u *)NULL, PV_NONE, *************** *** 2966,2972 **** p_term("t_CS", T_CCS) p_term("t_Cs", T_UCS) p_term("t_cs", T_CS) ! #ifdef FEAT_VERTSPLIT p_term("t_CV", T_CSV) #endif p_term("t_da", T_DA) --- 2963,2969 ---- p_term("t_CS", T_CCS) p_term("t_Cs", T_UCS) p_term("t_cs", T_CS) ! #ifdef FEAT_WINDOWS p_term("t_CV", T_CSV) #endif p_term("t_da", T_DA) *************** *** 3049,3055 **** static char *(p_scbopt_values[]) = {"ver", "hor", "jump", NULL}; #endif static char *(p_debug_values[]) = {"msg", "throw", "beep", NULL}; ! #ifdef FEAT_VERTSPLIT static char *(p_ead_values[]) = {"both", "ver", "hor", NULL}; #endif #if defined(FEAT_QUICKFIX) --- 3046,3052 ---- static char *(p_scbopt_values[]) = {"ver", "hor", "jump", NULL}; #endif static char *(p_debug_values[]) = {"msg", "throw", "beep", NULL}; ! #ifdef FEAT_WINDOWS static char *(p_ead_values[]) = {"both", "ver", "hor", NULL}; #endif #if defined(FEAT_QUICKFIX) *************** *** 6796,6802 **** } ! #ifdef FEAT_VERTSPLIT /* 'eadirection' */ else if (varp == &p_ead) { --- 6793,6799 ---- } ! #ifdef FEAT_WINDOWS /* 'eadirection' */ else if (varp == &p_ead) { *************** *** 8468,8474 **** win_setminheight(); } ! # ifdef FEAT_VERTSPLIT else if (pp == &p_wiw) { if (p_wiw < 1) --- 8465,8471 ---- win_setminheight(); } ! # ifdef FEAT_WINDOWS else if (pp == &p_wiw) { if (p_wiw < 1) *************** *** 10259,10266 **** #endif #ifdef FEAT_WINDOWS case PV_WFH: return (char_u *)&(curwin->w_p_wfh); - #endif - #ifdef FEAT_VERTSPLIT case PV_WFW: return (char_u *)&(curwin->w_p_wfw); #endif #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) --- 10256,10261 ---- *** ../vim-7.4.1610/src/quickfix.c 2016-03-19 13:34:59.385814682 +0100 --- src/quickfix.c 2016-03-19 21:36:09.575431787 +0100 *************** *** 1578,1588 **** * specified, the current window is vertically split and narrow. */ flags = WSP_HELP; - # ifdef FEAT_VERTSPLIT if (cmdmod.split == 0 && curwin->w_width != Columns && curwin->w_width < 80) flags |= WSP_TOP; - # endif if (qi != &ql_info) flags |= WSP_NEWLOC; /* don't copy the location list */ --- 1578,1586 ---- *************** *** 2360,2374 **** win_goto(win); if (eap->addr_count != 0) { - #ifdef FEAT_VERTSPLIT if (cmdmod.split & WSP_VERT) { if (height != W_WIDTH(win)) win_setwidth(height); } ! else ! #endif ! if (height != win->w_height) win_setheight(height); } } --- 2358,2369 ---- win_goto(win); if (eap->addr_count != 0) { if (cmdmod.split & WSP_VERT) { if (height != W_WIDTH(win)) win_setwidth(height); } ! else if (height != win->w_height) win_setheight(height); } } *************** *** 2425,2435 **** /* Only set the height when still in the same tab page and there is no * window to the side. */ ! if (curtab == prevtab ! #ifdef FEAT_VERTSPLIT ! && curwin->w_width == Columns ! #endif ! ) win_setheight(height); curwin->w_p_wfh = TRUE; /* set 'winfixheight' */ if (win_valid(win)) --- 2420,2426 ---- /* Only set the height when still in the same tab page and there is no * window to the side. */ ! if (curtab == prevtab && curwin->w_width == Columns) win_setheight(height); curwin->w_p_wfh = TRUE; /* set 'winfixheight' */ if (win_valid(win)) *** ../vim-7.4.1610/src/screen.c 2016-03-19 17:05:16.757964115 +0100 --- src/screen.c 2016-03-19 21:40:29.084703958 +0100 *************** *** 133,139 **** static void screen_line(int row, int coloff, int endcol, int clear_width); # define SCREEN_LINE(r, o, e, c, rl) screen_line((r), (o), (e), (c)) #endif ! #ifdef FEAT_VERTSPLIT static void draw_vsep_win(win_T *wp, int row); #endif #ifdef FEAT_STL_OPT --- 133,139 ---- static void screen_line(int row, int coloff, int endcol, int clear_width); # define SCREEN_LINE(r, o, e, c, rl) screen_line((r), (o), (e), (c)) #endif ! #ifdef FEAT_WINDOWS static void draw_vsep_win(win_T *wp, int row); #endif #ifdef FEAT_STL_OPT *************** *** 156,162 **** static void screenclear2(void); static void lineclear(unsigned off, int width); static void lineinvalid(unsigned off, int width); ! #ifdef FEAT_VERTSPLIT static void linecopy(int to, int from, win_T *wp); static void redraw_block(int row, int end, win_T *wp); #endif --- 156,162 ---- static void screenclear2(void); static void lineclear(unsigned off, int width); static void lineinvalid(unsigned off, int width); ! #ifdef FEAT_WINDOWS static void linecopy(int to, int from, win_T *wp); static void redraw_block(int row, int end, win_T *wp); #endif *************** *** 170,176 **** #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) static int fillchar_status(int *attr, int is_curwin); #endif ! #ifdef FEAT_VERTSPLIT static int fillchar_vsep(int *attr); #endif #ifdef FEAT_STL_OPT --- 170,176 ---- #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) static int fillchar_status(int *attr, int is_curwin); #endif ! #ifdef FEAT_WINDOWS static int fillchar_vsep(int *attr); #endif #ifdef FEAT_STL_OPT *************** *** 180,186 **** static void win_redr_ruler(win_T *wp, int always); #endif ! #if defined(FEAT_CLIPBOARD) || defined(FEAT_VERTSPLIT) /* Ugly global: overrule attribute used by screen_char() */ static int screen_char_attr = 0; #endif --- 180,186 ---- static void win_redr_ruler(win_T *wp, int always); #endif ! #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) /* Ugly global: overrule attribute used by screen_char() */ static int screen_char_attr = 0; #endif *************** *** 1095,1101 **** return; } ! #ifdef FEAT_VERTSPLIT /* Window is zero-width: Only need to draw the separator. */ if (wp->w_width == 0) { --- 1095,1101 ---- return; } ! #ifdef FEAT_WINDOWS /* Window is zero-width: Only need to draw the separator. */ if (wp->w_width == 0) { *************** *** 2138,2144 **** } else { ! #ifdef FEAT_VERTSPLIT draw_vsep_win(wp, row); #endif if (eof) /* we hit the end of the file */ --- 2138,2144 ---- } else { ! #ifdef FEAT_WINDOWS draw_vsep_win(wp, row); #endif if (eof) /* we hit the end of the file */ *************** *** 5627,5633 **** ) { win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); ! #ifdef FEAT_VERTSPLIT draw_vsep_win(wp, row); #endif row = endrow; --- 5627,5633 ---- ) { win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); ! #ifdef FEAT_WINDOWS draw_vsep_win(wp, row); #endif row = endrow; *************** *** 5835,5841 **** unsigned max_off_to; #endif int col = 0; ! #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_VERTSPLIT) int hl; #endif int force = FALSE; /* force update rest of the line */ --- 5835,5841 ---- unsigned max_off_to; #endif int col = 0; ! #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_WINDOWS) int hl; #endif int force = FALSE; /* force update rest of the line */ *************** *** 6174,6180 **** #endif screen_fill(row, row + 1, col + coloff, clear_width + coloff, ' ', ' ', 0); ! #ifdef FEAT_VERTSPLIT off_to += clear_width - col; col = clear_width; #endif --- 6174,6180 ---- #endif screen_fill(row, row + 1, col + coloff, clear_width + coloff, ' ', ' ', 0); ! #ifdef FEAT_WINDOWS off_to += clear_width - col; col = clear_width; #endif *************** *** 6183,6189 **** if (clear_width > 0) { ! #ifdef FEAT_VERTSPLIT /* For a window that's left of another, draw the separator char. */ if (col + coloff < Columns) { --- 6183,6189 ---- if (clear_width > 0) { ! #ifdef FEAT_WINDOWS /* For a window that's left of another, draw the separator char. */ if (col + coloff < Columns) { *************** *** 6289,6295 **** } #endif ! #if (defined(FEAT_WILDMENU) && defined(FEAT_VERTSPLIT)) || defined(PROTO) /* * Redraw all status lines at the bottom of frame "frp". */ --- 6289,6295 ---- } #endif ! #if (defined(FEAT_WILDMENU) && defined(FEAT_WINDOWS)) || defined(PROTO) /* * Redraw all status lines at the bottom of frame "frp". */ *************** *** 6313,6319 **** } #endif ! #ifdef FEAT_VERTSPLIT /* * Draw the verticap separator right of window "wp" starting with line "row". */ --- 6313,6319 ---- } #endif ! #ifdef FEAT_WINDOWS /* * Draw the verticap separator right of window "wp" starting with line "row". */ *************** *** 6606,6612 **** screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); } ! #ifdef FEAT_VERTSPLIT win_redraw_last_status(topframe); #else lastwin->w_redr_status = TRUE; --- 6606,6612 ---- screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); } ! #ifdef FEAT_WINDOWS win_redraw_last_status(topframe); #else lastwin->w_redr_status = TRUE; *************** *** 6700,6710 **** len += 4; } - #ifndef FEAT_VERTSPLIT - this_ru_col = ru_col; - if (this_ru_col < (Columns + 1) / 2) - this_ru_col = (Columns + 1) / 2; - #else this_ru_col = ru_col - (Columns - W_WIDTH(wp)); if (this_ru_col < (W_WIDTH(wp) + 1) / 2) this_ru_col = (W_WIDTH(wp) + 1) / 2; --- 6700,6705 ---- *************** *** 6714,6720 **** len = 1; } else - #endif #ifdef FEAT_MBYTE if (has_mbyte) { --- 6709,6714 ---- *************** *** 6761,6767 **** #endif } - #ifdef FEAT_VERTSPLIT /* * May need to draw the character below the vertical separator. */ --- 6755,6760 ---- *************** *** 6774,6780 **** screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), attr); } - #endif busy = FALSE; } --- 6767,6772 ---- *************** *** 6811,6817 **** } #endif - # ifdef FEAT_VERTSPLIT /* * Return TRUE if the status line of window "wp" is connected to the status * line of the window right of it. If not, then it's a vertical separator. --- 6803,6808 ---- *************** *** 6839,6845 **** } return FALSE; } - # endif #endif /* FEAT_WINDOWS */ --- 6830,6835 ---- *************** *** 6963,6969 **** if (*stl++ != '(') stl = p_ruf; } ! #ifdef FEAT_VERTSPLIT col = ru_col - (Columns - W_WIDTH(wp)); if (col < (W_WIDTH(wp) + 1) / 2) col = (W_WIDTH(wp) + 1) / 2; --- 6953,6959 ---- if (*stl++ != '(') stl = p_ruf; } ! #ifdef FEAT_WINDOWS col = ru_col - (Columns - W_WIDTH(wp)); if (col < (W_WIDTH(wp) + 1) / 2) col = (W_WIDTH(wp) + 1) / 2; *************** *** 6999,7005 **** # endif } ! #ifdef FEAT_VERTSPLIT col += W_WINCOL(wp); #endif } --- 6989,6995 ---- # endif } ! #ifdef FEAT_WINDOWS col += W_WINCOL(wp); #endif } *************** *** 8038,8044 **** /* * Stop highlighting first, so it's easier to move the cursor. */ ! #if defined(FEAT_CLIPBOARD) || defined(FEAT_VERTSPLIT) if (screen_char_attr != 0) attr = screen_char_attr; else --- 8028,8034 ---- /* * Stop highlighting first, so it's easier to move the cursor. */ ! #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) if (screen_char_attr != 0) attr = screen_char_attr; else *************** *** 8113,8119 **** } #endif ! #if defined(FEAT_CLIPBOARD) || defined(FEAT_VERTSPLIT) || defined(PROTO) /* * Draw a rectangle of the screen, inverted when "invert" is TRUE. * This uses the contents of ScreenLines[] and doesn't change it. --- 8103,8109 ---- } #endif ! #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) || defined(PROTO) /* * Draw a rectangle of the screen, inverted when "invert" is TRUE. * This uses the contents of ScreenLines[] and doesn't change it. *************** *** 8167,8173 **** } #endif ! #ifdef FEAT_VERTSPLIT /* * Redraw the characters for a vertically split window. */ --- 8157,8163 ---- } #endif ! #ifdef FEAT_WINDOWS /* * Redraw the characters for a vertically split window. */ *************** *** 8875,8881 **** (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); } ! #ifdef FEAT_VERTSPLIT /* * Copy part of a Screenline for vertically split window "wp". */ --- 8865,8871 ---- (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); } ! #ifdef FEAT_WINDOWS /* * Copy part of a Screenline for vertically split window "wp". */ *************** *** 9373,9379 **** /* only a few lines left: redraw is faster */ if (mayclear && Rows - line_count < 5 ! #ifdef FEAT_VERTSPLIT && wp->w_width == Columns #endif ) --- 9363,9369 ---- /* only a few lines left: redraw is faster */ if (mayclear && Rows - line_count < 5 ! #ifdef FEAT_WINDOWS && wp->w_width == Columns #endif ) *************** *** 9409,9420 **** * scroll-up . */ if (scroll_region ! #ifdef FEAT_VERTSPLIT || W_WIDTH(wp) != Columns #endif ) { ! #ifdef FEAT_VERTSPLIT if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) #endif scroll_region_set(wp, row); --- 9399,9410 ---- * scroll-up . */ if (scroll_region ! #ifdef FEAT_WINDOWS || W_WIDTH(wp) != Columns #endif ) { ! #ifdef FEAT_WINDOWS if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) #endif scroll_region_set(wp, row); *************** *** 9424,9430 **** else retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, wp->w_height - row, wp); ! #ifdef FEAT_VERTSPLIT if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) #endif scroll_region_reset(); --- 9414,9420 ---- else retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, wp->w_height - row, wp); ! #ifdef FEAT_WINDOWS if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) #endif scroll_region_reset(); *************** *** 9543,9549 **** * exists. */ result_empty = (row + line_count >= end); ! #ifdef FEAT_VERTSPLIT if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) type = USE_REDRAW; else --- 9533,9539 ---- * exists. */ result_empty = (row + line_count >= end); ! #ifdef FEAT_WINDOWS if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) type = USE_REDRAW; else *************** *** 9585,9591 **** /* Remove a modeless selection when inserting lines halfway the screen * or not the full width of the screen. */ if (off + row > 0 ! # ifdef FEAT_VERTSPLIT || (wp != NULL && wp->w_width != Columns) # endif ) --- 9575,9581 ---- /* Remove a modeless selection when inserting lines halfway the screen * or not the full width of the screen. */ if (off + row > 0 ! # ifdef FEAT_WINDOWS || (wp != NULL && wp->w_width != Columns) # endif ) *************** *** 9613,9619 **** end += off; for (i = 0; i < line_count; ++i) { ! #ifdef FEAT_VERTSPLIT if (wp != NULL && wp->w_width != Columns) { /* need to copy part of a line */ --- 9603,9609 ---- end += off; for (i = 0; i < line_count; ++i) { ! #ifdef FEAT_WINDOWS if (wp != NULL && wp->w_width != Columns) { /* need to copy part of a line */ *************** *** 9649,9655 **** screen_stop_highlight(); windgoto(cursor_row, 0); ! #ifdef FEAT_VERTSPLIT /* redraw the characters */ if (type == USE_REDRAW) redraw_block(row, end, wp); --- 9639,9645 ---- screen_stop_highlight(); windgoto(cursor_row, 0); ! #ifdef FEAT_WINDOWS /* redraw the characters */ if (type == USE_REDRAW) redraw_block(row, end, wp); *************** *** 9758,9764 **** * 5. Use T_DL (delete line) if it exists. * 6. redraw the characters from ScreenLines[]. */ ! #ifdef FEAT_VERTSPLIT if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) type = USE_REDRAW; else --- 9748,9754 ---- * 5. Use T_DL (delete line) if it exists. * 6. redraw the characters from ScreenLines[]. */ ! #ifdef FEAT_WINDOWS if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) type = USE_REDRAW; else *************** *** 9790,9796 **** else if (*T_CDL != NUL && line_count > 1 && can_delete) type = USE_T_CDL; else if (can_clear(T_CE) && result_empty ! #ifdef FEAT_VERTSPLIT && (wp == NULL || wp->w_width == Columns) #endif ) --- 9780,9786 ---- else if (*T_CDL != NUL && line_count > 1 && can_delete) type = USE_T_CDL; else if (can_clear(T_CE) && result_empty ! #ifdef FEAT_WINDOWS && (wp == NULL || wp->w_width == Columns) #endif ) *************** *** 9806,9812 **** /* Remove a modeless selection when deleting lines halfway the screen or * not the full width of the screen. */ if (off + row > 0 ! # ifdef FEAT_VERTSPLIT || (wp != NULL && wp->w_width != Columns) # endif ) --- 9796,9802 ---- /* Remove a modeless selection when deleting lines halfway the screen or * not the full width of the screen. */ if (off + row > 0 ! # ifdef FEAT_WINDOWS || (wp != NULL && wp->w_width != Columns) # endif ) *************** *** 9840,9846 **** end += off; for (i = 0; i < line_count; ++i) { ! #ifdef FEAT_VERTSPLIT if (wp != NULL && wp->w_width != Columns) { /* need to copy part of a line */ --- 9830,9836 ---- end += off; for (i = 0; i < line_count; ++i) { ! #ifdef FEAT_WINDOWS if (wp != NULL && wp->w_width != Columns) { /* need to copy part of a line */ *************** *** 9876,9882 **** screen_stop_highlight(); ! #ifdef FEAT_VERTSPLIT /* redraw the characters */ if (type == USE_REDRAW) redraw_block(row, end, wp); --- 9866,9872 ---- screen_stop_highlight(); ! #ifdef FEAT_WINDOWS /* redraw the characters */ if (type == USE_REDRAW) redraw_block(row, end, wp); *************** *** 10445,10451 **** } #endif ! #ifdef FEAT_VERTSPLIT /* * Get the character to use in a separator between vertically split windows. * Get its attributes in "*attr". --- 10435,10441 ---- } #endif ! #ifdef FEAT_WINDOWS /* * Get the character to use in a separator between vertically split windows. * Get its attributes in "*attr". *************** *** 10540,10546 **** int i; size_t len; int o; ! #ifdef FEAT_VERTSPLIT int this_ru_col; int off = 0; int width = Columns; --- 10530,10536 ---- int i; size_t len; int o; ! #ifdef FEAT_WINDOWS int this_ru_col; int off = 0; int width = Columns; *************** *** 10623,10632 **** { row = W_WINROW(wp) + wp->w_height; fillchar = fillchar_status(&attr, wp == curwin); - # ifdef FEAT_VERTSPLIT off = W_WINCOL(wp); width = W_WIDTH(wp); - # endif } else #endif --- 10613,10620 ---- *************** *** 10634,10640 **** row = Rows - 1; fillchar = ' '; attr = 0; ! #ifdef FEAT_VERTSPLIT width = Columns; off = 0; #endif --- 10622,10628 ---- row = Rows - 1; fillchar = ' '; attr = 0; ! #ifdef FEAT_WINDOWS width = Columns; off = 0; #endif *************** *** 10674,10680 **** if (wp->w_status_height == 0) /* can't use last char of screen */ #endif ++o; ! #ifdef FEAT_VERTSPLIT this_ru_col = ru_col - (Columns - width); if (this_ru_col < 0) this_ru_col = 0; --- 10662,10668 ---- if (wp->w_status_height == 0) /* can't use last char of screen */ #endif ++o; ! #ifdef FEAT_WINDOWS this_ru_col = ru_col - (Columns - width); if (this_ru_col < 0) this_ru_col = 0; *** ../vim-7.4.1610/src/syntax.c 2016-03-12 22:11:34.255300112 +0100 --- src/syntax.c 2016-03-19 21:40:46.772518047 +0100 *************** *** 6783,6789 **** "StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold"), CENT("StatusLineNC term=reverse cterm=reverse", "StatusLineNC term=reverse cterm=reverse gui=reverse"), ! #ifdef FEAT_VERTSPLIT CENT("VertSplit term=reverse cterm=reverse", "VertSplit term=reverse cterm=reverse gui=reverse"), #endif --- 6783,6789 ---- "StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold"), CENT("StatusLineNC term=reverse cterm=reverse", "StatusLineNC term=reverse cterm=reverse gui=reverse"), ! #ifdef FEAT_WINDOWS CENT("VertSplit term=reverse cterm=reverse", "VertSplit term=reverse cterm=reverse gui=reverse"), #endif *** ../vim-7.4.1610/src/term.c 2016-02-27 18:13:05.240593068 +0100 --- src/term.c 2016-03-19 21:41:44.515911136 +0100 *************** *** 179,191 **** # ifdef TERMINFO {(int)KS_CDL, IF_EB("\033|%p1%dD", ESC_STR "|%p1%dD")}, {(int)KS_CS, IF_EB("\033|%p1%d;%p2%dR", ESC_STR "|%p1%d;%p2%dR")}, ! # ifdef FEAT_VERTSPLIT {(int)KS_CSV, IF_EB("\033|%p1%d;%p2%dV", ESC_STR "|%p1%d;%p2%dV")}, # endif # else {(int)KS_CDL, IF_EB("\033|%dD", ESC_STR "|%dD")}, {(int)KS_CS, IF_EB("\033|%d;%dR", ESC_STR "|%d;%dR")}, ! # ifdef FEAT_VERTSPLIT {(int)KS_CSV, IF_EB("\033|%d;%dV", ESC_STR "|%d;%dV")}, # endif # endif --- 179,191 ---- # ifdef TERMINFO {(int)KS_CDL, IF_EB("\033|%p1%dD", ESC_STR "|%p1%dD")}, {(int)KS_CS, IF_EB("\033|%p1%d;%p2%dR", ESC_STR "|%p1%d;%p2%dR")}, ! # ifdef FEAT_WINDOWS {(int)KS_CSV, IF_EB("\033|%p1%d;%p2%dV", ESC_STR "|%p1%d;%p2%dV")}, # endif # else {(int)KS_CDL, IF_EB("\033|%dD", ESC_STR "|%dD")}, {(int)KS_CS, IF_EB("\033|%d;%dR", ESC_STR "|%d;%dR")}, ! # ifdef FEAT_WINDOWS {(int)KS_CSV, IF_EB("\033|%d;%dV", ESC_STR "|%d;%dV")}, # endif # endif *************** *** 1080,1086 **** # else {(int)KS_CS, "[%dCS%d]"}, # endif ! # ifdef FEAT_VERTSPLIT # ifdef TERMINFO {(int)KS_CSV, "[%p1%dCSV%p2%d]"}, # else --- 1080,1086 ---- # else {(int)KS_CS, "[%dCS%d]"}, # endif ! # ifdef FEAT_WINDOWS # ifdef TERMINFO {(int)KS_CSV, "[%p1%dCSV%p2%d]"}, # else *************** *** 2862,2868 **** if (old_Columns != Columns) { old_Columns = Columns; ! #ifdef FEAT_VERTSPLIT shell_new_columns(); /* update window sizes */ #endif } --- 2862,2868 ---- if (old_Columns != Columns) { old_Columns = Columns; ! #ifdef FEAT_WINDOWS shell_new_columns(); /* update window sizes */ #endif } *************** *** 3485,3491 **** { OUT_STR(tgoto((char *)T_CS, W_WINROW(wp) + wp->w_height - 1, W_WINROW(wp) + off)); ! #ifdef FEAT_VERTSPLIT if (*T_CSV != NUL && wp->w_width != Columns) OUT_STR(tgoto((char *)T_CSV, W_WINCOL(wp) + wp->w_width - 1, W_WINCOL(wp))); --- 3485,3491 ---- { OUT_STR(tgoto((char *)T_CS, W_WINROW(wp) + wp->w_height - 1, W_WINROW(wp) + off)); ! #ifdef FEAT_WINDOWS if (*T_CSV != NUL && wp->w_width != Columns) OUT_STR(tgoto((char *)T_CSV, W_WINCOL(wp) + wp->w_width - 1, W_WINCOL(wp))); *************** *** 3500,3506 **** scroll_region_reset(void) { OUT_STR(tgoto((char *)T_CS, (int)Rows - 1, 0)); ! #ifdef FEAT_VERTSPLIT if (*T_CSV != NUL) OUT_STR(tgoto((char *)T_CSV, (int)Columns - 1, 0)); #endif --- 3500,3506 ---- scroll_region_reset(void) { OUT_STR(tgoto((char *)T_CS, (int)Rows - 1, 0)); ! #ifdef FEAT_WINDOWS if (*T_CSV != NUL) OUT_STR(tgoto((char *)T_CSV, (int)Columns - 1, 0)); #endif *** ../vim-7.4.1610/src/ui.c 2016-03-11 22:52:00.742438030 +0100 --- src/ui.c 2016-03-19 21:43:43.530660291 +0100 *************** *** 2583,2589 **** int which_button) /* MOUSE_LEFT, MOUSE_RIGHT, MOUSE_MIDDLE */ { static int on_status_line = 0; /* #lines below bottom of window */ ! #ifdef FEAT_VERTSPLIT static int on_sep_line = 0; /* on separator right of window */ #endif static int prev_row = -1; --- 2583,2589 ---- int which_button) /* MOUSE_LEFT, MOUSE_RIGHT, MOUSE_MIDDLE */ { static int on_status_line = 0; /* #lines below bottom of window */ ! #ifdef FEAT_WINDOWS static int on_sep_line = 0; /* on separator right of window */ #endif static int prev_row = -1; *************** *** 2623,2629 **** * line, stop Visual mode */ if (on_status_line) return IN_STATUS_LINE; ! #ifdef FEAT_VERTSPLIT if (on_sep_line) return IN_SEP_LINE; #endif --- 2623,2629 ---- * line, stop Visual mode */ if (on_status_line) return IN_STATUS_LINE; ! #ifdef FEAT_WINDOWS if (on_sep_line) return IN_SEP_LINE; #endif *************** *** 2681,2687 **** } else on_status_line = 0; ! #ifdef FEAT_VERTSPLIT if (col >= wp->w_width) /* In separator line */ { on_sep_line = col - wp->w_width + 1; --- 2681,2687 ---- } else on_status_line = 0; ! #ifdef FEAT_WINDOWS if (col >= wp->w_width) /* In separator line */ { on_sep_line = col - wp->w_width + 1; *************** *** 2706,2712 **** if (VIsual_active && (wp->w_buffer != curwin->w_buffer || (!on_status_line ! #ifdef FEAT_VERTSPLIT && !on_sep_line #endif #ifdef FEAT_FOLDING --- 2706,2712 ---- if (VIsual_active && (wp->w_buffer != curwin->w_buffer || (!on_status_line ! #ifdef FEAT_WINDOWS && !on_sep_line #endif #ifdef FEAT_FOLDING *************** *** 2730,2738 **** { /* A click outside the command-line window: Use modeless * selection if possible. Allow dragging the status lines. */ - # ifdef FEAT_VERTSPLIT on_sep_line = 0; - # endif # ifdef FEAT_CLIPBOARD if (on_status_line) return IN_STATUS_LINE; --- 2730,2736 ---- *************** *** 2764,2770 **** else return IN_STATUS_LINE | CURSOR_MOVED; } ! #ifdef FEAT_VERTSPLIT if (on_sep_line) /* In (or below) status line */ { /* Don't use start_arrow() if we're in the same window */ --- 2762,2768 ---- else return IN_STATUS_LINE | CURSOR_MOVED; } ! #ifdef FEAT_WINDOWS if (on_sep_line) /* In (or below) status line */ { /* Don't use start_arrow() if we're in the same window */ *************** *** 2798,2804 **** #endif return IN_STATUS_LINE; /* Cursor didn't move */ } ! #ifdef FEAT_VERTSPLIT else if (on_sep_line && which_button == MOUSE_LEFT) { if (dragwin != NULL) --- 2796,2802 ---- #endif return IN_STATUS_LINE; /* Cursor didn't move */ } ! #ifdef FEAT_WINDOWS else if (on_sep_line && which_button == MOUSE_LEFT) { if (dragwin != NULL) *************** *** 2828,2834 **** #endif row -= W_WINROW(curwin); ! #ifdef FEAT_VERTSPLIT col -= W_WINCOL(curwin); #endif --- 2826,2832 ---- #endif row -= W_WINROW(curwin); ! #ifdef FEAT_WINDOWS col -= W_WINCOL(curwin); #endif *************** *** 3089,3095 **** { if (fp->fr_layout == FR_LEAF) break; - #ifdef FEAT_VERTSPLIT if (fp->fr_layout == FR_ROW) { for (fp = fp->fr_child; fp->fr_next != NULL; fp = fp->fr_next) --- 3087,3092 ---- *************** *** 3099,3105 **** *colp -= fp->fr_width; } } - #endif else /* fr_layout == FR_COL */ { for (fp = fp->fr_child; fp->fr_next != NULL; fp = fp->fr_next) --- 3096,3101 ---- *************** *** 3141,3147 **** */ if (row >= wp->w_height) /* In (or below) status line */ return IN_STATUS_LINE; ! #ifdef FEAT_VERTSPLIT if (col >= wp->w_width) /* In vertical separator line */ return IN_SEP_LINE; #endif --- 3137,3143 ---- */ if (row >= wp->w_height) /* In (or below) status line */ return IN_STATUS_LINE; ! #ifdef FEAT_WINDOWS if (col >= wp->w_width) /* In vertical separator line */ return IN_SEP_LINE; #endif *** ../vim-7.4.1610/src/window.c 2016-03-13 19:04:45.381224860 +0100 --- src/window.c 2016-03-19 21:52:40.805010388 +0100 *************** *** 16,24 **** static void win_init_some(win_T *newp, win_T *oldp); static void frame_comp_pos(frame_T *topfrp, int *row, int *col); static void frame_setheight(frame_T *curfrp, int height); - #ifdef FEAT_VERTSPLIT static void frame_setwidth(frame_T *curfrp, int width); - #endif static void win_exchange(long); static void win_rotate(int, int); static void win_totop(int size, int flags); --- 16,22 ---- *************** *** 32,38 **** static int frame_has_win(frame_T *frp, win_T *wp); static void frame_new_height(frame_T *topfrp, int height, int topfirst, int wfh); static int frame_fixed_height(frame_T *frp); - #ifdef FEAT_VERTSPLIT static int frame_fixed_width(frame_T *frp); static void frame_add_statusline(frame_T *frp); static void frame_new_width(frame_T *topfrp, int width, int leftfirst, int wfw); --- 30,35 ---- *************** *** 40,46 **** static int frame_minwidth(frame_T *topfrp, win_T *next_curwin); static void frame_fix_width(win_T *wp); #endif - #endif static int win_alloc_firstwin(win_T *oldwin); static void new_frame(win_T *wp); #if defined(FEAT_WINDOWS) || defined(PROTO) --- 37,42 ---- *************** *** 54,63 **** static void frame_append(frame_T *after, frame_T *frp); static void frame_insert(frame_T *before, frame_T *frp); static void frame_remove(frame_T *frp); - # ifdef FEAT_VERTSPLIT static void win_goto_ver(int up, long count); static void win_goto_hor(int left, long count); - # endif static void frame_add_height(frame_T *frp, int n); static void last_status_rec(frame_T *fr, int statusline); --- 50,57 ---- *************** *** 68,76 **** static win_T *restore_snapshot_rec(frame_T *sn, frame_T *fr); static int frame_check_height(frame_T *topfrp, int height); - #ifdef FEAT_VERTSPLIT static int frame_check_width(frame_T *topfrp, int width); - #endif #endif /* FEAT_WINDOWS */ --- 62,68 ---- *************** *** 143,166 **** (void)win_split((int)Prenum, 0); break; - #ifdef FEAT_VERTSPLIT /* split current window in two parts, vertically */ case Ctrl_V: case 'v': CHECK_CMDWIN reset_VIsual_and_resel(); /* stop Visual mode */ ! # ifdef FEAT_QUICKFIX /* When splitting the quickfix window open a new buffer in it, * don't replicate the quickfix buffer. */ if (bt_quickfix(curbuf)) goto newwindow; ! # endif ! # ifdef FEAT_GUI need_mouse_correct = TRUE; ! # endif (void)win_split((int)Prenum, WSP_VERT); break; - #endif /* split current window and edit alternate file */ case Ctrl_HAT: --- 135,156 ---- (void)win_split((int)Prenum, 0); break; /* split current window in two parts, vertically */ case Ctrl_V: case 'v': CHECK_CMDWIN reset_VIsual_and_resel(); /* stop Visual mode */ ! #ifdef FEAT_QUICKFIX /* When splitting the quickfix window open a new buffer in it, * don't replicate the quickfix buffer. */ if (bt_quickfix(curbuf)) goto newwindow; ! #endif ! #ifdef FEAT_GUI need_mouse_correct = TRUE; ! #endif (void)win_split((int)Prenum, WSP_VERT); break; /* split current window and edit alternate file */ case Ctrl_HAT: *************** *** 184,190 **** vim_snprintf((char *)cbuf, sizeof(cbuf) - 5, "%ld", Prenum); else cbuf[0] = NUL; ! #if defined(FEAT_VERTSPLIT) && defined(FEAT_QUICKFIX) if (nchar == 'v' || nchar == Ctrl_V) STRCAT(cbuf, "v"); #endif --- 174,180 ---- vim_snprintf((char *)cbuf, sizeof(cbuf) - 5, "%ld", Prenum); else cbuf[0] = NUL; ! #if defined(FEAT_QUICKFIX) if (nchar == 'v' || nchar == Ctrl_V) STRCAT(cbuf, "v"); #endif *************** *** 282,295 **** case K_DOWN: case Ctrl_J: CHECK_CMDWIN - #ifdef FEAT_VERTSPLIT win_goto_ver(FALSE, Prenum1); - #else - for (wp = curwin; wp->w_next != NULL && Prenum1-- > 0; - wp = wp->w_next) - ; - win_goto(wp); - #endif break; /* cursor to window above */ --- 272,278 ---- *************** *** 297,313 **** case K_UP: case Ctrl_K: CHECK_CMDWIN - #ifdef FEAT_VERTSPLIT win_goto_ver(TRUE, Prenum1); - #else - for (wp = curwin; wp->w_prev != NULL && Prenum1-- > 0; - wp = wp->w_prev) - ; - win_goto(wp); - #endif break; - #ifdef FEAT_VERTSPLIT /* cursor to left window */ case 'h': case K_LEFT: --- 280,288 ---- *************** *** 324,330 **** CHECK_CMDWIN win_goto_hor(FALSE, Prenum1); break; - #endif /* move window to new tab page */ case 'T': --- 299,304 ---- *************** *** 397,406 **** /* move window to the very top/bottom/left/right */ case 'K': case 'J': - #ifdef FEAT_VERTSPLIT case 'H': case 'L': - #endif CHECK_CMDWIN win_totop((int)Prenum, ((nchar == 'H' || nchar == 'L') ? WSP_VERT : 0) --- 371,378 ---- *************** *** 440,446 **** win_setheight(Prenum ? (int)Prenum : 9999); break; - #ifdef FEAT_VERTSPLIT /* increase current window width */ case '>': #ifdef FEAT_GUI --- 412,417 ---- *************** *** 464,470 **** #endif win_setwidth(Prenum != 0 ? (int)Prenum : 9999); break; - #endif /* jump to tag and split window if tag exists (in preview window) */ #if defined(FEAT_QUICKFIX) --- 435,440 ---- *************** *** 655,661 **** case Ctrl_RSB: case 'g': case Ctrl_G: - #ifdef FEAT_VERTSPLIT case Ctrl_V: case 'v': case 'h': --- 625,630 ---- *************** *** 666,672 **** case 'L': case '>': case '<': - #endif #if defined(FEAT_QUICKFIX) case '}': #endif --- 635,640 ---- *************** *** 831,837 **** out_flush(); #endif - #ifdef FEAT_VERTSPLIT if (flags & WSP_VERT) { int wmw1; --- 799,804 ---- *************** *** 920,926 **** } } else - #endif { layout = FR_COL; --- 887,892 ---- *************** *** 998,1007 **** /* Only make all windows the same height if one of them (except oldwin) * is higher than one of the split windows. */ ! if (!do_equal && p_ea && size == 0 ! #ifdef FEAT_VERTSPLIT ! && *p_ead != 'h' ! #endif && oldwin->w_frame->fr_parent != NULL) { frp = oldwin->w_frame->fr_parent->fr_child; --- 964,970 ---- /* Only make all windows the same height if one of them (except oldwin) * is higher than one of the split windows. */ ! if (!do_equal && p_ea && size == 0 && *p_ead != 'h' && oldwin->w_frame->fr_parent != NULL) { frp = oldwin->w_frame->fr_parent->fr_child; *************** *** 1027,1037 **** && ((flags & WSP_BOT) || (flags & WSP_BELOW) || (!(flags & WSP_ABOVE) ! && ( ! #ifdef FEAT_VERTSPLIT ! (flags & WSP_VERT) ? p_spr : ! #endif ! p_sb)))) { /* new window below/right of current one */ if (new_wp == NULL) --- 990,996 ---- && ((flags & WSP_BOT) || (flags & WSP_BELOW) || (!(flags & WSP_ABOVE) ! && ( (flags & WSP_VERT) ? p_spr : p_sb)))) { /* new window below/right of current one */ if (new_wp == NULL) *************** *** 1068,1079 **** */ if (flags & (WSP_TOP | WSP_BOT)) { - #ifdef FEAT_VERTSPLIT if ((topframe->fr_layout == FR_COL && (flags & WSP_VERT) == 0) || (topframe->fr_layout == FR_ROW && (flags & WSP_VERT) != 0)) - #else - if (topframe->fr_layout == FR_COL) - #endif { curfrp = topframe->fr_child; if (flags & WSP_BOT) --- 1027,1034 ---- *************** *** 1091,1102 **** before = FALSE; else if (flags & WSP_ABOVE) before = TRUE; ! else ! #ifdef FEAT_VERTSPLIT ! if (flags & WSP_VERT) before = !p_spr; else - #endif before = !p_sb; } if (curfrp->fr_parent == NULL || curfrp->fr_parent->fr_layout != layout) --- 1046,1054 ---- before = FALSE; else if (flags & WSP_ABOVE) before = TRUE; ! else if (flags & WSP_VERT) before = !p_spr; else before = !p_sb; } if (curfrp->fr_parent == NULL || curfrp->fr_parent->fr_layout != layout) *************** *** 1136,1142 **** set_fraction(oldwin); wp->w_fraction = oldwin->w_fraction; - #ifdef FEAT_VERTSPLIT if (flags & WSP_VERT) { wp->w_p_scr = curwin->w_p_scr; --- 1088,1093 ---- *************** *** 1194,1203 **** frame_fix_width(wp); } else - #endif { /* width and column of new window is same as current window */ - #ifdef FEAT_VERTSPLIT if (flags & (WSP_TOP | WSP_BOT)) { wp->w_wincol = 0; --- 1145,1152 ---- *************** *** 1211,1217 **** wp->w_vsep_width = oldwin->w_vsep_width; } frp->fr_width = curfrp->fr_width; - #endif /* "new_size" of the current window goes to the new window, use * one row for the status line */ --- 1160,1165 ---- *************** *** 1234,1243 **** /* Don't set the status_height for oldwin yet, this might break * frame_fix_height(oldwin), therefore will be set below. */ } - #ifdef FEAT_VERTSPLIT if (flags & WSP_BOT) frame_add_statusline(curfrp); - #endif frame_fix_height(wp); frame_fix_height(oldwin); --- 1182,1189 ---- *************** *** 1273,1287 **** */ if (do_equal || dir != 0) win_equal(wp, TRUE, - #ifdef FEAT_VERTSPLIT (flags & WSP_VERT) ? (dir == 'v' ? 'b' : 'h') ! : dir == 'h' ? 'b' : ! #endif ! 'v'); /* Don't change the window height/width to 'winheight' / 'winwidth' if a * size was given. */ - #ifdef FEAT_VERTSPLIT if (flags & WSP_VERT) { i = p_wiw; --- 1219,1229 ---- */ if (do_equal || dir != 0) win_equal(wp, TRUE, (flags & WSP_VERT) ? (dir == 'v' ? 'b' : 'h') ! : dir == 'h' ? 'b' : 'v'); /* Don't change the window height/width to 'winheight' / 'winwidth' if a * size was given. */ if (flags & WSP_VERT) { i = p_wiw; *************** *** 1295,1301 **** # endif } else - #endif { i = p_wh; if (size != 0) --- 1237,1242 ---- *************** *** 1311,1321 **** * make the new window the current window */ win_enter(wp, FALSE); - #ifdef FEAT_VERTSPLIT if (flags & WSP_VERT) p_wiw = i; else - #endif p_wh = i; return OK; --- 1252,1260 ---- *************** *** 1454,1460 **** int maxcount; int todo; - #ifdef FEAT_VERTSPLIT if (vertical) { /* Each windows needs at least 'winminwidth' lines and a separator --- 1393,1398 ---- *************** *** 1463,1469 **** - (p_wiw - p_wmw)) / (p_wmw + 1); } else - #endif { /* Each window needs at least 'winminheight' lines and a status line. */ maxcount = (curwin->w_height + curwin->w_status_height --- 1401,1406 ---- *************** *** 1491,1497 **** /* todo is number of windows left to create */ for (todo = count - 1; todo > 0; --todo) - #ifdef FEAT_VERTSPLIT if (vertical) { if (win_split(curwin->w_width - (curwin->w_width - todo) --- 1428,1433 ---- *************** *** 1499,1505 **** break; } else - #endif { if (win_split(curwin->w_height - (curwin->w_height - todo * STATUS_HEIGHT) / (todo + 1) --- 1435,1440 ---- *************** *** 1587,1593 **** temp = curwin->w_status_height; curwin->w_status_height = wp->w_status_height; wp->w_status_height = temp; - #ifdef FEAT_VERTSPLIT temp = curwin->w_vsep_width; curwin->w_vsep_width = wp->w_vsep_width; wp->w_vsep_width = temp; --- 1522,1527 ---- *************** *** 1610,1616 **** frame_fix_width(curwin); frame_fix_width(wp); } - #endif (void)win_comp_pos(); /* recompute window positions */ --- 1544,1549 ---- *************** *** 1640,1646 **** need_mouse_correct = TRUE; #endif - #ifdef FEAT_VERTSPLIT /* Check if all frames in this row/col have one window. */ for (frp = curwin->w_frame->fr_parent->fr_child; frp != NULL; frp = frp->fr_next) --- 1573,1578 ---- *************** *** 1649,1655 **** EMSG(_("E443: Cannot rotate when another window is split")); return; } - #endif while (count--) { --- 1581,1586 ---- *************** *** 1691,1705 **** wp1->w_status_height = n; frame_fix_height(wp1); frame_fix_height(wp2); - #ifdef FEAT_VERTSPLIT n = wp2->w_vsep_width; wp2->w_vsep_width = wp1->w_vsep_width; wp1->w_vsep_width = n; frame_fix_width(wp1); frame_fix_width(wp2); - #endif ! /* recompute w_winrow and w_wincol for all windows */ (void)win_comp_pos(); } --- 1622,1634 ---- wp1->w_status_height = n; frame_fix_height(wp1); frame_fix_height(wp2); n = wp2->w_vsep_width; wp2->w_vsep_width = wp1->w_vsep_width; wp1->w_vsep_width = n; frame_fix_width(wp1); frame_fix_width(wp2); ! /* recompute w_winrow and w_wincol for all windows */ (void)win_comp_pos(); } *************** *** 1736,1742 **** win_equal(curwin, TRUE, 'v'); } ! #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT) /* When 'guioptions' includes 'L' or 'R' may have to remove or add * scrollbars. Have to update them anyway. */ gui_may_update_scrollbars(); --- 1665,1671 ---- win_equal(curwin, TRUE, 'v'); } ! #if defined(FEAT_GUI) /* When 'guioptions' includes 'L' or 'R' may have to remove or add * scrollbars. Have to update them anyway. */ gui_may_update_scrollbars(); *************** *** 1766,1772 **** height = win1->w_prev->w_status_height; win1->w_prev->w_status_height = win1->w_status_height; win1->w_status_height = height; - #ifdef FEAT_VERTSPLIT if (win1->w_prev->w_vsep_width == 1) { /* Remove the vertical separator from the last-but-one window, --- 1695,1700 ---- *************** *** 1776,1789 **** win1->w_vsep_width = 1; win1->w_frame->fr_width += 1; } - #endif } else if (win2 == lastwin) { height = win1->w_status_height; win1->w_status_height = win2->w_status_height; win2->w_status_height = height; - #ifdef FEAT_VERTSPLIT if (win1->w_vsep_width == 1) { /* Remove the vertical separator from win1, add it to the last --- 1704,1715 ---- *************** *** 1793,1799 **** win1->w_vsep_width = 0; win1->w_frame->fr_width -= 1; } - #endif } win_remove(win1, NULL); frame_remove(win1->w_frame); --- 1719,1724 ---- *************** *** 1819,1829 **** 'b' for both, 0 for using p_ead */ { if (dir == 0) - #ifdef FEAT_VERTSPLIT dir = *p_ead; - #else - dir = 'b'; - #endif win_equal_rec(next_curwin == NULL ? curwin : next_curwin, current, topframe, dir, 0, tabline_height(), (int)Columns, topframe->fr_height); --- 1744,1750 ---- *************** *** 1861,1881 **** /* Set the width/height of this frame. * Redraw when size or position changes */ if (topfr->fr_height != height || topfr->fr_win->w_winrow != row - #ifdef FEAT_VERTSPLIT || topfr->fr_width != width || topfr->fr_win->w_wincol != col - #endif ) { topfr->fr_win->w_winrow = row; frame_new_height(topfr, height, FALSE, FALSE); - #ifdef FEAT_VERTSPLIT topfr->fr_win->w_wincol = col; frame_new_width(topfr, width, FALSE, FALSE); - #endif redraw_all_later(CLEAR); } } - #ifdef FEAT_VERTSPLIT else if (topfr->fr_layout == FR_ROW) { topfr->fr_width = width; --- 1782,1797 ---- *************** *** 2017,2028 **** totwincount -= wincount; } } - #endif else /* topfr->fr_layout == FR_COL */ { - #ifdef FEAT_VERTSPLIT topfr->fr_width = width; - #endif topfr->fr_height = height; if (dir != 'h') /* equalize frame heights */ --- 1933,1941 ---- *************** *** 2486,2503 **** curbuf = curwin->w_buffer; close_curwin = TRUE; } ! if (p_ea ! #ifdef FEAT_VERTSPLIT ! && (*p_ead == 'b' || *p_ead == dir) ! #endif ! ) ! win_equal(curwin, TRUE, ! #ifdef FEAT_VERTSPLIT ! dir ! #else ! 0 ! #endif ! ); else win_comp_pos(); if (close_curwin) --- 2399,2406 ---- curbuf = curwin->w_buffer; close_curwin = TRUE; } ! if (p_ea && (*p_ead == 'b' || *p_ead == dir)) ! win_equal(curwin, TRUE, dir); else win_comp_pos(); if (close_curwin) *************** *** 2521,2527 **** if (help_window) restore_snapshot(SNAP_HELP_IDX, close_curwin); ! #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT) /* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */ if (gui.in_use && !win_hasvertsplit()) gui_init_which_components(NULL); --- 2424,2430 ---- if (help_window) restore_snapshot(SNAP_HELP_IDX, close_curwin); ! #if defined(FEAT_GUI) /* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */ if (gui.in_use && !win_hasvertsplit()) gui_init_which_components(NULL); *************** *** 2678,2687 **** /* Remove this frame from the list of frames. */ frame_remove(frp_close); - #ifdef FEAT_VERTSPLIT if (frp_close->fr_parent->fr_layout == FR_COL) { - #endif /* When 'winfixheight' is set, try to find another frame in the column * (as close to the closed frame as possible) to distribute the height * to. */ --- 2581,2588 ---- *************** *** 2715,2721 **** } frame_new_height(frp2, frp2->fr_height + frp_close->fr_height, frp2 == frp_close->fr_next ? TRUE : FALSE, FALSE); - #ifdef FEAT_VERTSPLIT *dirp = 'v'; } else --- 2616,2621 ---- *************** *** 2755,2761 **** frp2 == frp_close->fr_next ? TRUE : FALSE, FALSE); *dirp = 'h'; } - #endif /* If rows/columns go to a window below/right its positions need to be * updated. Can only be done after the sizes have been updated. */ --- 2655,2660 ---- *************** *** 2830,2840 **** return alt_tabpage()->tp_curwin->w_frame; frp = win->w_frame; - #ifdef FEAT_VERTSPLIT if (frp->fr_parent != NULL && frp->fr_parent->fr_layout == FR_ROW) b = p_spr; else - #endif b = p_sb; if ((!b && frp->fr_next != NULL) || frp->fr_prev == NULL) return frp->fr_next; --- 2729,2737 ---- *************** *** 2909,2915 **** win_new_height(topfrp->fr_win, height - topfrp->fr_win->w_status_height); } - #ifdef FEAT_VERTSPLIT else if (topfrp->fr_layout == FR_ROW) { do --- 2806,2811 ---- *************** *** 2928,2934 **** } while (frp != NULL); } - #endif else /* fr_layout == FR_COL */ { /* Complicated case: Resize a column of frames. Resize the bottom --- 2824,2829 ---- *************** *** 3027,3033 **** return TRUE; } - #ifdef FEAT_VERTSPLIT /* * Return TRUE if width of frame "frp" should not be changed because of * the 'winfixwidth' option. --- 2922,2927 ---- *************** *** 3249,3255 **** { wp->w_frame->fr_width = wp->w_width + wp->w_vsep_width; } - #endif /* * Set frame height from the window it contains. --- 3143,3148 ---- *************** *** 3272,3280 **** { frame_T *frp; int m; - #ifdef FEAT_VERTSPLIT int n; - #endif if (topfrp->fr_win != NULL) { --- 3165,3171 ---- *************** *** 3289,3295 **** ++m; } } - #ifdef FEAT_VERTSPLIT else if (topfrp->fr_layout == FR_ROW) { /* get the minimal height from each frame in this row */ --- 3180,3185 ---- *************** *** 3301,3307 **** m = n; } } - #endif else { /* Add up the minimal heights for all frames in this column. */ --- 3191,3196 ---- *************** *** 3313,3319 **** return m; } - #ifdef FEAT_VERTSPLIT /* * Compute the minimal width for frame "topfrp". * When "next_curwin" isn't NULL, use p_wiw for this window. --- 3202,3207 ---- *************** *** 3362,3368 **** return m; } - #endif /* --- 3250,3255 ---- *************** *** 3559,3567 **** if (curwin->w_frame == NULL) return FAIL; topframe = curwin->w_frame; - #ifdef FEAT_VERTSPLIT topframe->fr_width = Columns; - #endif topframe->fr_height = Rows - p_ch; topframe->fr_win = curwin; --- 3446,3452 ---- *************** *** 3592,3601 **** { firstwin->w_height = ROWS_AVAIL; topframe->fr_height = ROWS_AVAIL; - #ifdef FEAT_VERTSPLIT firstwin->w_width = Columns; topframe->fr_width = Columns; - #endif } #if defined(FEAT_WINDOWS) || defined(PROTO) --- 3477,3484 ---- *************** *** 3932,3941 **** #endif )) shell_new_rows(); - #ifdef FEAT_VERTSPLIT if (curtab->tp_old_Columns != Columns && starting == 0) shell_new_columns(); /* update window widths */ - #endif #if defined(FEAT_GUI) /* When 'guioptions' includes 'L' or 'R' may have to remove or add --- 3815,3822 ---- *************** *** 4214,4220 **** } #endif - #ifdef FEAT_VERTSPLIT /* * Move to window above or below "count" times. */ --- 4095,4100 ---- *************** *** 4340,4346 **** if (foundfr != NULL) win_goto(foundfr->fr_win); } - #endif /* * Make window "wp" the current window. --- 4220,4225 ---- *************** *** 4468,4478 **** else if (curwin->w_height == 0) win_setheight(1); - #ifdef FEAT_VERTSPLIT /* set window width to desired minimal value */ if (curwin->w_width < p_wiw && !curwin->w_p_wfw) win_setwidth((int)p_wiw); - #endif #ifdef FEAT_MOUSE setmouse(); /* in case jumped to/from help buffer */ --- 4347,4355 ---- *************** *** 4592,4601 **** if (!hidden) win_append(after, new_wp); #endif - #ifdef FEAT_VERTSPLIT new_wp->w_wincol = 0; new_wp->w_width = Columns; - #endif /* position the display and the cursor at the top of the file. */ new_wp->w_topline = 1; --- 4469,4476 ---- *************** *** 4915,4921 **** #endif } ! #if defined(FEAT_VERTSPLIT) || defined(PROTO) /* * Called from win_new_shellsize() after Columns changed. */ --- 4790,4796 ---- #endif } ! #if defined(FEAT_WINDOWS) || defined(PROTO) /* * Called from win_new_shellsize() after Columns changed. */ *************** *** 5016,5062 **** { win_T *wp; frame_T *frp; - #ifdef FEAT_VERTSPLIT int startcol; int startrow; - #endif wp = topfrp->fr_win; if (wp != NULL) { ! if (wp->w_winrow != *row ! #ifdef FEAT_VERTSPLIT ! || wp->w_wincol != *col ! #endif ! ) { /* position changed, redraw */ wp->w_winrow = *row; - #ifdef FEAT_VERTSPLIT wp->w_wincol = *col; - #endif redraw_win_later(wp, NOT_VALID); wp->w_redr_status = TRUE; } *row += wp->w_height + wp->w_status_height; - #ifdef FEAT_VERTSPLIT *col += wp->w_width + wp->w_vsep_width; - #endif } else { - #ifdef FEAT_VERTSPLIT startrow = *row; startcol = *col; - #endif for (frp = topfrp->fr_child; frp != NULL; frp = frp->fr_next) { - #ifdef FEAT_VERTSPLIT if (topfrp->fr_layout == FR_ROW) *row = startrow; /* all frames are at the same row */ else *col = startcol; /* all frames are at the same col */ - #endif frame_comp_pos(frp, row, col); } } --- 4891,4923 ---- { win_T *wp; frame_T *frp; int startcol; int startrow; wp = topfrp->fr_win; if (wp != NULL) { ! if (wp->w_winrow != *row || wp->w_wincol != *col) { /* position changed, redraw */ wp->w_winrow = *row; wp->w_wincol = *col; redraw_win_later(wp, NOT_VALID); wp->w_redr_status = TRUE; } *row += wp->w_height + wp->w_status_height; *col += wp->w_width + wp->w_vsep_width; } else { startrow = *row; startcol = *col; for (frp = topfrp->fr_child; frp != NULL; frp = frp->fr_next) { if (topfrp->fr_layout == FR_ROW) *row = startrow; /* all frames are at the same row */ else *col = startcol; /* all frames are at the same col */ frame_comp_pos(frp, row, col); } } *************** *** 5172,5178 **** /* * Column of frames: try to change only frames in this column. */ - #ifdef FEAT_VERTSPLIT /* * Do this twice: * 1: compute room available, if it's not enough try resizing the --- 5033,5038 ---- *************** *** 5181,5189 **** * Try not to reduce the height of a window with 'winfixheight' set. */ for (run = 1; run <= 2; ++run) - #else - for (;;) - #endif { room = 0; room_reserved = 0; --- 5041,5046 ---- *************** *** 5198,5208 **** if (frp != curfrp) room -= frame_minheight(frp, NULL); } - #ifdef FEAT_VERTSPLIT if (curfrp->fr_width != Columns) room_cmdline = 0; else - #endif { room_cmdline = Rows - p_ch - (lastwin->w_winrow + lastwin->w_height + lastwin->w_status_height); --- 5055,5063 ---- *************** *** 5212,5230 **** if (height <= room + room_cmdline) break; - #ifdef FEAT_VERTSPLIT if (run == 2 || curfrp->fr_width == Columns) - #endif { if (height > room + room_cmdline) height = room + room_cmdline; break; } - #ifdef FEAT_VERTSPLIT frame_setheight(curfrp->fr_parent, height + frame_minheight(curfrp->fr_parent, NOWIN) - (int)p_wmh - 1); - #endif - /*NOTREACHED*/ } /* --- 5067,5080 ---- *************** *** 5308,5314 **** } } - #if defined(FEAT_VERTSPLIT) || defined(PROTO) /* * Set current window width and take care of repositioning other windows to * fit around it. --- 5158,5163 ---- *************** *** 5483,5489 **** } } } - #endif /* FEAT_VERTSPLIT */ /* * Check 'winminheight' for a valid value. --- 5332,5337 ---- *************** *** 5644,5650 **** showmode(); } - # if defined(FEAT_VERTSPLIT) || defined(PROTO) /* * Separator line of dragwin is dragged "offset" lines right (negative is left). */ --- 5492,5497 ---- *************** *** 5747,5753 **** (void)win_comp_pos(); redraw_all_later(NOT_VALID); } - # endif /* FEAT_VERTSPLIT */ #endif /* FEAT_MOUSE */ #endif /* FEAT_WINDOWS */ --- 5594,5599 ---- *************** *** 5918,5924 **** invalidate_botline_win(wp); } ! #ifdef FEAT_VERTSPLIT /* * Set the width of a window. */ --- 5764,5770 ---- invalidate_botline_win(wp); } ! #ifdef FEAT_WINDOWS /* * Set the width of a window. */ *************** *** 5965,5974 **** /* Find bottom frame with width of screen. */ frp = lastwin->w_frame; - # ifdef FEAT_VERTSPLIT while (frp->fr_width != Columns && frp->fr_parent != NULL) frp = frp->fr_parent; - # endif /* Avoid changing the height of a window with 'winfixheight' set. */ while (frp->fr_prev != NULL && frp->fr_layout == FR_LEAF --- 5811,5818 ---- *************** *** 6104,6117 **** redraw_all_later(SOME_VALID); } } - #ifdef FEAT_VERTSPLIT else if (fr->fr_layout == FR_ROW) { /* vertically split windows, set status line for each one */ for (fp = fr->fr_child; fp != NULL; fp = fp->fr_next) last_status_rec(fp, statusline); } - #endif else { /* horizontally split window, set status line for last one */ --- 5948,5959 ---- *************** *** 6574,6582 **** if (*frp == NULL) return; (*frp)->fr_layout = fr->fr_layout; - # ifdef FEAT_VERTSPLIT (*frp)->fr_width = fr->fr_width; - # endif (*frp)->fr_height = fr->fr_height; if (fr->fr_next != NULL) make_snapshot_rec(fr->fr_next, &((*frp)->fr_next)); --- 6416,6422 ---- *************** *** 6620,6628 **** win_T *wp; if (curtab->tp_snapshot[idx] != NULL - # ifdef FEAT_VERTSPLIT && curtab->tp_snapshot[idx]->fr_width == topframe->fr_width - # endif && curtab->tp_snapshot[idx]->fr_height == topframe->fr_height && check_snapshot_rec(curtab->tp_snapshot[idx], topframe) == OK) { --- 6460,6466 ---- *************** *** 6665,6679 **** win_T *wp2; fr->fr_height = sn->fr_height; - # ifdef FEAT_VERTSPLIT fr->fr_width = sn->fr_width; - # endif if (fr->fr_layout == FR_LEAF) { frame_new_height(fr, fr->fr_height, FALSE, FALSE); - # ifdef FEAT_VERTSPLIT frame_new_width(fr, fr->fr_width, FALSE, FALSE); - # endif wp = sn->fr_win; } if (sn->fr_next != NULL) --- 6503,6513 ---- *************** *** 6811,6817 **** } #endif ! #if (defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)) || defined(PROTO) /* * Return TRUE if there is any vertically split window. */ --- 6645,6651 ---- } #endif ! #if (defined(FEAT_GUI) && defined(FEAT_WINDOWS)) || defined(PROTO) /* * Return TRUE if there is any vertically split window. */ *************** *** 7181,7187 **** } #endif ! #if defined(FEAT_VERTSPLIT) || defined(PROTO) /* * Return TRUE if "topfrp" and its children are at the right width. */ --- 7015,7021 ---- } #endif ! #if defined(FEAT_WINDOWS) || defined(PROTO) /* * Return TRUE if "topfrp" and its children are at the right width. */ *** ../vim-7.4.1610/src/globals.h 2016-03-06 14:44:03.810733631 +0100 --- src/globals.h 2016-03-19 21:54:05.184101179 +0100 *************** *** 427,433 **** EXTERN int drag_status_line INIT(= FALSE); /* dragging the status line */ EXTERN int postponed_mouseshape INIT(= FALSE); /* postponed updating the mouse pointer shape */ ! # ifdef FEAT_VERTSPLIT EXTERN int drag_sep_line INIT(= FALSE); /* dragging vert separator */ # endif # endif --- 427,433 ---- EXTERN int drag_status_line INIT(= FALSE); /* dragging the status line */ EXTERN int postponed_mouseshape INIT(= FALSE); /* postponed updating the mouse pointer shape */ ! # ifdef FEAT_WINDOWS EXTERN int drag_sep_line INIT(= FALSE); /* dragging vert separator */ # endif # endif *************** *** 1547,1555 **** EXTERN char_u e_wildexpand[] INIT(= N_("E79: Cannot expand wildcards")); #ifdef FEAT_WINDOWS EXTERN char_u e_winheight[] INIT(= N_("E591: 'winheight' cannot be smaller than 'winminheight'")); - # ifdef FEAT_VERTSPLIT EXTERN char_u e_winwidth[] INIT(= N_("E592: 'winwidth' cannot be smaller than 'winminwidth'")); - # endif #endif EXTERN char_u e_write[] INIT(= N_("E80: Error while writing")); EXTERN char_u e_zerocount[] INIT(= N_("Zero count")); --- 1547,1553 ---- *** ../vim-7.4.1610/src/gui.h 2016-02-23 17:13:56.877032330 +0100 --- src/gui.h 2016-03-19 21:54:14.899996508 +0100 *************** *** 179,185 **** /* Values measured in characters: */ int top; /* Top of scroll bar (chars from row 0) */ int height; /* Current height of scroll bar in rows */ ! #ifdef FEAT_VERTSPLIT int width; /* Current width of scroll bar in cols */ #endif int status_height; /* Height of status line */ --- 179,185 ---- /* Values measured in characters: */ int top; /* Top of scroll bar (chars from row 0) */ int height; /* Current height of scroll bar in rows */ ! #ifdef FEAT_WINDOWS int width; /* Current width of scroll bar in cols */ #endif int status_height; /* Height of status line */ *** ../vim-7.4.1610/src/if_py_both.h 2016-03-14 23:04:49.698923062 +0100 --- src/if_py_both.h 2016-03-19 21:54:47.751642623 +0100 *************** *** 3673,3680 **** #ifdef FEAT_WINDOWS else if (strcmp(name, "row") == 0) return PyLong_FromLong((long)(self->win->w_winrow)); - #endif - #ifdef FEAT_VERTSPLIT else if (strcmp(name, "width") == 0) return PyLong_FromLong((long)(W_WIDTH(self->win))); else if (strcmp(name, "col") == 0) --- 3673,3678 ---- *************** *** 3765,3771 **** return 0; } ! #ifdef FEAT_VERTSPLIT else if (strcmp(name, "width") == 0) { long width; --- 3763,3769 ---- return 0; } ! #ifdef FEAT_WINDOWS else if (strcmp(name, "width") == 0) { long width; *** ../vim-7.4.1610/src/option.h 2016-03-19 18:21:30.326003240 +0100 --- src/option.h 2016-03-19 21:55:24.623245493 +0100 *************** *** 463,469 **** #define DY_LASTLINE 0x001 #define DY_UHEX 0x002 EXTERN int p_ed; /* 'edcompatible' */ ! #ifdef FEAT_VERTSPLIT EXTERN char_u *p_ead; /* 'eadirection' */ #endif EXTERN int p_ea; /* 'equalalways' */ --- 463,469 ---- #define DY_LASTLINE 0x001 #define DY_UHEX 0x002 EXTERN int p_ed; /* 'edcompatible' */ ! #ifdef FEAT_WINDOWS EXTERN char_u *p_ead; /* 'eadirection' */ #endif EXTERN int p_ea; /* 'equalalways' */ *************** *** 802,808 **** #ifdef FEAT_SPELL EXTERN char_u *p_sps; /* 'spellsuggest' */ #endif ! #ifdef FEAT_VERTSPLIT EXTERN int p_spr; /* 'splitright' */ #endif EXTERN int p_sol; /* 'startofline' */ --- 802,808 ---- #ifdef FEAT_SPELL EXTERN char_u *p_sps; /* 'spellsuggest' */ #endif ! #ifdef FEAT_WINDOWS EXTERN int p_spr; /* 'splitright' */ #endif EXTERN int p_sol; /* 'startofline' */ *************** *** 957,964 **** #ifdef FEAT_WINDOWS EXTERN long p_wh; /* 'winheight' */ EXTERN long p_wmh; /* 'winminheight' */ - #endif - #ifdef FEAT_VERTSPLIT EXTERN long p_wmw; /* 'winminwidth' */ EXTERN long p_wiw; /* 'winwidth' */ #endif --- 957,962 ---- *************** *** 1172,1179 **** #endif #ifdef FEAT_WINDOWS , WV_WFH - #endif - #ifdef FEAT_VERTSPLIT , WV_WFW #endif , WV_WRAP --- 1170,1175 ---- *** ../vim-7.4.1610/src/structs.h 2016-03-15 23:10:26.412712095 +0100 --- src/structs.h 2016-03-19 21:56:05.366806730 +0100 *************** *** 2200,2206 **** struct frame_S { char fr_layout; /* FR_LEAF, FR_COL or FR_ROW */ ! #ifdef FEAT_VERTSPLIT int fr_width; int fr_newwidth; /* new width used in win_equal_rec() */ #endif --- 2200,2206 ---- struct frame_S { char fr_layout; /* FR_LEAF, FR_COL or FR_ROW */ ! #ifdef FEAT_WINDOWS int fr_width; int fr_newwidth; /* new width used in win_equal_rec() */ #endif *************** *** 2370,2377 **** status/command line(s) */ #ifdef FEAT_WINDOWS int w_status_height; /* number of status lines (0 or 1) */ - #endif - #ifdef FEAT_VERTSPLIT int w_wincol; /* Leftmost column of window in screen. use W_WINCOL() */ int w_width; /* Width of window, excluding separation. --- 2370,2375 ---- *** ../vim-7.4.1610/src/term.h 2015-06-25 17:03:32.584666216 +0200 --- src/term.h 2016-03-19 21:56:24.934596031 +0100 *************** *** 83,89 **** KS_CSI, /* start insert mode (bar cursor) */ KS_CEI, /* end insert mode (block cursor) */ KS_CSR, /* start replace mode (underline cursor) */ ! #ifdef FEAT_VERTSPLIT KS_CSV, /* scroll region vertical */ #endif KS_OP, /* original color pair */ --- 83,89 ---- KS_CSI, /* start insert mode (bar cursor) */ KS_CEI, /* end insert mode (block cursor) */ KS_CSR, /* start replace mode (underline cursor) */ ! #ifdef FEAT_WINDOWS KS_CSV, /* scroll region vertical */ #endif KS_OP, /* original color pair */ *** ../vim-7.4.1610/src/feature.h 2016-03-15 23:10:26.408712137 +0100 --- src/feature.h 2016-03-19 21:53:25.292530982 +0100 *************** *** 97,102 **** --- 97,103 ---- /* * +windows Multiple windows. Without this there is no help * window and no status lines. + * +vertsplit Vertically split windows. */ #ifdef FEAT_SMALL # define FEAT_WINDOWS *************** *** 112,127 **** #endif /* - * +vertsplit Vertically split windows. - */ - #ifdef FEAT_NORMAL - # define FEAT_VERTSPLIT - #endif - #if defined(FEAT_VERTSPLIT) && !defined(FEAT_WINDOWS) - # define FEAT_WINDOWS - #endif - - /* * +cmdhist Command line history. */ #ifdef FEAT_SMALL --- 113,118 ---- *************** *** 144,151 **** # define FEAT_JUMPLIST #endif ! /* the cmdline-window requires FEAT_VERTSPLIT and FEAT_CMDHIST */ ! #if defined(FEAT_VERTSPLIT) && defined(FEAT_CMDHIST) # define FEAT_CMDWIN #endif --- 135,142 ---- # define FEAT_JUMPLIST #endif ! /* the cmdline-window requires FEAT_WINDOWS and FEAT_CMDHIST */ ! #if defined(FEAT_WINDOWS) && defined(FEAT_CMDHIST) # define FEAT_CMDWIN #endif *************** *** 601,607 **** * +mksession ":mksession" command. * Requires +windows and +vertsplit. */ ! #if defined(FEAT_NORMAL) && defined(FEAT_WINDOWS) && defined(FEAT_VERTSPLIT) # define FEAT_SESSION #endif --- 592,598 ---- * +mksession ":mksession" command. * Requires +windows and +vertsplit. */ ! #if defined(FEAT_NORMAL) && defined(FEAT_WINDOWS) # define FEAT_SESSION #endif *** ../vim-7.4.1610/src/vim.h 2016-03-12 22:47:10.548935254 +0100 --- src/vim.h 2016-03-19 21:21:31.656663145 +0100 *************** *** 810,816 **** #define FINDFILE_DIR 1 /* only directories */ #define FINDFILE_BOTH 2 /* files and directories */ ! #ifdef FEAT_VERTSPLIT # define W_WINCOL(wp) (wp->w_wincol) # define W_WIDTH(wp) (wp->w_width) # define W_ENDCOL(wp) (wp->w_wincol + wp->w_width) --- 810,816 ---- #define FINDFILE_DIR 1 /* only directories */ #define FINDFILE_BOTH 2 /* files and directories */ ! #ifdef FEAT_WINDOWS # define W_WINCOL(wp) (wp->w_wincol) # define W_WIDTH(wp) (wp->w_width) # define W_ENDCOL(wp) (wp->w_wincol + wp->w_width) *** ../vim-7.4.1610/src/version.c 2016-03-19 20:51:30.707550109 +0100 --- src/version.c 2016-03-19 21:44:06.202422019 +0100 *************** *** 646,652 **** #else "-user_commands", #endif ! #ifdef FEAT_VERTSPLIT "+vertsplit", #else "-vertsplit", --- 646,652 ---- #else "-user_commands", #endif ! #ifdef FEAT_WINDOWS "+vertsplit", #else "-vertsplit", *** ../vim-7.4.1610/src/version.c 2016-03-19 20:51:30.707550109 +0100 --- src/version.c 2016-03-19 21:44:06.202422019 +0100 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1611, /**/ -- How many light bulbs does it take to change a person? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///