Hi Bram and Vimmers,
I have received reports of problems related to :split and laststatus=0.
I was confirmed by CUI Vim 7.4.1832 on fedora 23 via PuTTY (80x24)
Issue 1:
- Start pure Vim with some options.
$ vim -Nu NONE -c "set ls=0 splitbelow"
- Check window height.
:echo winheight(0)
23
- split and quit window.
:sp | q
- Recheck window height.
:echo winheight(0)
Expected value: 23
Actual value: 22 and command-line line has moved up by one line.
Issue 2:
- Start pure Vim with some options.
$ vim -Nu NONE -c "set ls=0"
- Split window.
:botright sp
- Type `:`.
Expected behavior:
- Cursor move to last line. Because 'cmdheight' is 1 (default).
Actual behavior:
- Cursor has moved to the second from the bottom. It's wrong.
Issue 3:
- Start pure Vim with some options.
$ vim -Nu NONE -c "set ls=0"
- Vertical split window.
:vsp
- Open command-line window.
q:
Expected behavior:
- Command line window is opened.
Actual behavior:
- Likewise opened, but obviously the second line from the bottom strange.
REMARKS:
The issue 3 is related to the following patch and thread.
patch 7.4.706
https://github.com/vim/vim/commit/5b14f89164fa2f40f52283226c98005887568317
Re: [bug] cmdline-window given laststatus=0 and vertical split
https://groups.google.com/forum/#!searchin/vim_dev/Yclept$20Nemo/vim_dev/fNq8tHTcKfA/7yg4GZ1h8agJ
I think patch 7.4.706 is no good solution.
This patch is updating the window information after updating the frame
information.
It generates a Inconsistencies between the frame information and the window
information, and It cause abnormal window drawing.
I wrote a patch to fix above all issues. Of course, the test was also added.
Please check an attached patch.
--
Best regards,
Hirohito Higashi (a.k.a. h_east)
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
diff --git a/src/Makefile b/src/Makefile
index b3b8daf..2e8665a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2057,6 +2057,7 @@ test_arglist \
test_viminfo \
test_viml \
test_visual \
+ test_window_cmd \
test_window_id \
test_alot_latin \
test_alot_utf8 \
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index 6bfd81e..d8d460a 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -32,3 +32,4 @@ source test_tagjump.vim
source test_timers.vim
source test_undolevels.vim
source test_unlet.vim
+source test_window_cmd.vim
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim
new file mode 100644
index 0000000..d7e432d
--- /dev/null
+++ b/src/testdir/test_window_cmd.vim
@@ -0,0 +1,36 @@
+" Tests for window cmd (:wincmd, :split, :vsplit, :resize and etc...)
+
+func Test_window_cmd_ls0_with_split()
+ set ls=0
+ set splitbelow
+ split
+ quit
+ call assert_equal(0, &lines - &cmdheight - winheight(0))
+ new | only!
+ "
+ set splitbelow&vim
+ botright split
+ quit
+ call assert_equal(0, &lines - &cmdheight - winheight(0))
+ new | only!
+ set ls&vim
+endfunc
+
+func Test_window_cmd_cmdwin_with_vsp()
+ let efmt='Expected 0 but got %d (in ls=%d, %s window)'
+ for v in range(0, 2)
+ exec "set ls=" . v
+ vsplit
+ call feedkeys("q:\<CR>")
+ let ac = &lines - (&cmdheight + winheight(0) + !!v)
+ let emsg = printf(efmt, ac, v, 'left')
+ call assert_equal(0, ac, emsg)
+ wincmd w
+ let ac = &lines - (&cmdheight + winheight(0) + !!v)
+ let emsg = printf(efmt, ac, v, 'right')
+ call assert_equal(0, ac, emsg)
+ new | only!
+ endfor
+ set ls&vim
+endfunc
+" vim: sw=2 et
diff --git a/src/window.c b/src/window.c
index bbd0a52..01da765 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1165,8 +1165,13 @@ win_split_ins(
* one row for the status line */
win_new_height(wp, new_size);
if (flags & (WSP_TOP | WSP_BOT))
- frame_new_height(curfrp, curfrp->fr_height
- - (new_size + STATUS_HEIGHT), flags & WSP_TOP, FALSE);
+ {
+ int new_fr_height = curfrp->fr_height - new_size;
+
+ if (!((flags & WSP_BOT) && p_ls == 0))
+ new_fr_height -= STATUS_HEIGHT;
+ frame_new_height(curfrp, new_fr_height, flags & WSP_TOP, FALSE);
+ }
else
win_new_height(oldwin, oldwin_height - (new_size + STATUS_HEIGHT));
if (before) /* new window above current one */
@@ -1179,18 +1184,13 @@ win_split_ins(
{
wp->w_winrow = oldwin->w_winrow + oldwin->w_height + STATUS_HEIGHT;
wp->w_status_height = oldwin->w_status_height;
- /* Don't set the status_height for oldwin yet, this might break
- * frame_fix_height(oldwin), therefore will be set below. */
+ if (!(flags & WSP_BOT))
+ oldwin->w_status_height = STATUS_HEIGHT;
}
if (flags & WSP_BOT)
frame_add_statusline(curfrp);
frame_fix_height(wp);
frame_fix_height(oldwin);
-
- if (!before)
- /* new window above current one, set the status_height after
- * frame_fix_height(oldwin) */
- oldwin->w_status_height = STATUS_HEIGHT;
}
if (flags & (WSP_TOP | WSP_BOT))
