summaryrefslogtreecommitdiffstats
path: root/src/ex_docmd.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-10-02 16:23:58 +0200
committerBram Moolenaar <Bram@vim.org>2018-10-02 16:23:58 +0200
commit586c70cdfede55a166e3564f1cb68a299d81987d (patch)
treee06b99bc5cb372212335dbee06976f6f0cb19417 /src/ex_docmd.c
parent4f888757257795969f2ab2e6fc3544a5bef3cdea (diff)
patch 8.1.0447: GUI scrollbar test fails with Athena and Motifv8.1.0447
Problem: GUI scrollbar test fails with Athena and Motif. Solution: When not using on-the-fly scrolling call normal_cmd().
Diffstat (limited to 'src/ex_docmd.c')
-rw-r--r--src/ex_docmd.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2d233ace86..70acfc83d3 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10471,21 +10471,24 @@ exec_normal_cmd(char_u *cmd, int remap, int silent)
{
/* Stuff the argument into the typeahead buffer. */
ins_typebuf(cmd, remap, 0, TRUE, silent);
- exec_normal(FALSE, FALSE);
+ exec_normal(FALSE, FALSE, FALSE);
}
/*
* Execute normal_cmd() until there is no typeahead left.
+ * When "use_vpeekc" is TRUE use vpeekc() to check for available chars.
*/
void
-exec_normal(int was_typed, int may_use_terminal_loop UNUSED)
+exec_normal(int was_typed, int use_vpeekc, int may_use_terminal_loop UNUSED)
{
oparg_T oa;
clear_oparg(&oa);
finish_op = FALSE;
- while ((!stuff_empty() || ((was_typed || !typebuf_typed())
- && typebuf.tb_len > 0)) && !got_int)
+ while ((!stuff_empty()
+ || ((was_typed || !typebuf_typed()) && typebuf.tb_len > 0)
+ || (use_vpeekc && vpeekc() != NUL))
+ && !got_int)
{
update_topline_cursor();
#ifdef FEAT_TERMINAL