diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-04-09 15:03:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-04-09 15:03:15 +0200 |
| commit | 7860bac57baeda408d5ef84f3334b0e52cc690bd (patch) | |
| tree | e7d4936956a087140d5f45a32f617cb8ef669180 | |
| parent | d2381a2cadb9ef359ad5efb916734c635b29bd13 (diff) | |
| download | vim-git-8.0.0556.tar.gz | |
patch 8.0.0556: getting window position fails if GUI and term possiblev8.0.0556
Problem: Getting the window position fails if both the GUI and term
code is built in.
Solution: Return after getting the GUI window position. (Kazunobu Kuriyama)
| -rw-r--r-- | src/evalfunc.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 08f0a41af..45c43f685 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -5302,6 +5302,7 @@ f_getwinposx(typval_T *argvars UNUSED, typval_T *rettv) if (gui_mch_get_winpos(&x, &y) == OK) rettv->vval.v_number = x; + return; } #endif #if defined(HAVE_TGETENT) && defined(FEAT_TERMRESPONSE) @@ -5328,6 +5329,7 @@ f_getwinposy(typval_T *argvars UNUSED, typval_T *rettv) if (gui_mch_get_winpos(&x, &y) == OK) rettv->vval.v_number = y; + return; } #endif #if defined(HAVE_TGETENT) && defined(FEAT_TERMRESPONSE) @@ -7715,6 +7717,7 @@ static int mkdir_recurse(char_u *dir, int prot); /* * Create the directory in which "dir" is located, and higher levels when * needed. + * Return OK or FAIL. */ static int mkdir_recurse(char_u *dir, int prot) diff --git a/src/version.c b/src/version.c index 7cf764443..efb2ef3e9 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 556, +/**/ 555, /**/ 554, |