To: vim_dev@googlegroups.com Subject: Patch 8.1.0931 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.0931 Problem: vtp_working included in GUI build but unused. Solution: Adjust #ifdefs. (Ken Takata, closes #3971) Files: src/os_win32.c *** ../vim-8.1.0930/src/os_win32.c 2019-02-13 19:23:04.734816702 +0100 --- src/os_win32.c 2019-02-16 14:02:12.004047301 +0100 *************** *** 186,197 **** static int win32_setattrs(char_u *name, int attrs); static int win32_set_archive(char_u *name); - static int vtp_working = 0; static int conpty_working = 0; static int conpty_stable = 0; static void vtp_flag_init(); #ifndef FEAT_GUI_W32 static void vtp_init(); static void vtp_exit(); static int vtp_printf(char *format, ...); --- 186,197 ---- static int win32_setattrs(char_u *name, int attrs); static int win32_set_archive(char_u *name); static int conpty_working = 0; static int conpty_stable = 0; static void vtp_flag_init(); #ifndef FEAT_GUI_W32 + static int vtp_working = 0; static void vtp_init(); static void vtp_exit(); static int vtp_printf(char *format, ...); *************** *** 7874,7887 **** return T_NAME != NULL && STRCMP(T_NAME, "win32") == 0; } - #endif - int has_vtp_working(void) { return vtp_working; } int has_conpty_working(void) { --- 7874,7887 ---- return T_NAME != NULL && STRCMP(T_NAME, "win32") == 0; } int has_vtp_working(void) { return vtp_working; } + #endif + int has_conpty_working(void) { *** ../vim-8.1.0930/src/version.c 2019-02-16 13:45:05.574240125 +0100 --- src/version.c 2019-02-16 14:06:47.822412531 +0100 *************** *** 785,786 **** --- 785,788 ---- { /* Add new patch number below this line */ + /**/ + 931, /**/ -- A village. Sound of chanting of Latin canon, punctuated by short, sharp cracks. It comes nearer. We see it is a line of MONKS ala SEVENTH SEAL flagellation scene, chanting and banging themselves on the foreheads with wooden boards. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///