diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-10-02 16:23:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-10-02 16:23:58 +0200 |
| commit | 586c70cdfede55a166e3564f1cb68a299d81987d (patch) | |
| tree | e06b99bc5cb372212335dbee06976f6f0cb19417 | |
| parent | 4f888757257795969f2ab2e6fc3544a5bef3cdea (diff) | |
| download | vim-git-8.1.0447.tar.gz | |
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().
| -rw-r--r-- | src/evalfunc.c | 6 | ||||
| -rw-r--r-- | src/ex_docmd.c | 11 | ||||
| -rw-r--r-- | src/proto/ex_docmd.pro | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index dd9bc1811..c9f4c4581 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3588,7 +3588,7 @@ f_feedkeys(typval_T *argvars, typval_T *rettv UNUSED) if (!dangerous) ++ex_normal_busy; - exec_normal(TRUE, TRUE); + exec_normal(TRUE, FALSE, TRUE); if (!dangerous) --ex_normal_busy; @@ -13233,6 +13233,10 @@ f_test_scrollbar(typval_T *argvars, typval_T *rettv UNUSED) return; } gui_drag_scrollbar(sb, value, dragging); +# ifndef USE_ON_FLY_SCROLL + // need to loop through normal_cmd() to handle the scroll events + exec_normal(FALSE, TRUE, FALSE); +# endif } #endif diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 2d233ace8..70acfc83d 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 diff --git a/src/proto/ex_docmd.pro b/src/proto/ex_docmd.pro index 8baf953b7..ed42f1cf1 100644 --- a/src/proto/ex_docmd.pro +++ b/src/proto/ex_docmd.pro @@ -59,7 +59,7 @@ int save_current_state(save_state_T *sst); void restore_current_state(save_state_T *sst); void ex_normal(exarg_T *eap); void exec_normal_cmd(char_u *cmd, int remap, int silent); -void exec_normal(int was_typed, int may_use_terminal_loop); +void exec_normal(int was_typed, int use_vpeekc, int may_use_terminal_loop); int find_cmdline_var(char_u *src, int *usedlen); char_u *eval_vars(char_u *src, char_u *srcstart, int *usedlen, linenr_T *lnump, char_u **errormsg, int *escaped); char_u *expand_sfile(char_u *arg); diff --git a/src/version.c b/src/version.c index c5153eca7..717425afa 100644 --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 447, +/**/ 446, /**/ 445, |