diff options
| -rw-r--r-- | src/gui_gtk_x11.c | 2 | ||||
| -rw-r--r-- | src/os_unix.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index de8f265e..f905eaf6 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -6190,7 +6190,7 @@ gui_mch_draw_string(int row, int col, char_u *s, int len, int flags) int pcc[MAX_MCO]; /* TODO: use the composing characters */ - c = utfc_ptr2char_len(p, &pcc, len - (p - s)); + c = utfc_ptr2char_len(p, pcc, len - (p - s)); if (c >= 0x10000) /* show chars > 0xffff as ? */ c = 0xbf; buf[textlen].byte1 = c >> 8; diff --git a/src/os_unix.c b/src/os_unix.c index a5f033db..5e11eea3 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1471,6 +1471,9 @@ x_IOerror_check(dpy) { /* This function should not return, it causes exit(). Longjump instead. */ LONGJMP(lc_jump_env, 1); +# ifdef VMS + return 0; /* avoid the compiler complains about missing return value */ +# endif } # endif @@ -1490,6 +1493,9 @@ x_IOerror_handler(dpy) /* This function should not return, it causes exit(). Longjump instead. */ LONGJMP(x_jump_env, 1); +# ifdef VMS + return 0; /* avoid the compiler complains about missing return value */ +# endif } #endif diff --git a/src/version.c b/src/version.c index b83d0b61..d71cbbc2 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 358, +/**/ 357, /**/ 356, |