To: vim_dev@googlegroups.com Subject: Patch 8.2.4605 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4605 Problem: Error for arguments of remote_expr() even when the +clientserver feature is not included. Solution: Move #ifdef. Files: src/clientserver.c *** ../vim-8.2.4604/src/clientserver.c 2022-02-07 13:56:40.592793019 +0000 --- src/clientserver.c 2022-03-15 17:32:13.632107317 +0000 *************** *** 794,799 **** --- 794,800 ---- rettv->v_type = VAR_STRING; rettv->vval.v_string = NULL; + #ifdef FEAT_CLIENTSERVER if (in_vim9script() && (check_for_string_arg(argvars, 0) == FAIL || check_for_string_arg(argvars, 1) == FAIL *************** *** 802,808 **** && check_for_opt_number_arg(argvars, 3) == FAIL))) return; - #ifdef FEAT_CLIENTSERVER remote_common(argvars, rettv, TRUE); #endif } --- 803,808 ---- *************** *** 945,957 **** rettv->v_type = VAR_STRING; rettv->vval.v_string = NULL; if (in_vim9script() && (check_for_string_arg(argvars, 0) == FAIL || check_for_string_arg(argvars, 1) == FAIL || check_for_opt_string_arg(argvars, 2) == FAIL)) return; - #ifdef FEAT_CLIENTSERVER remote_common(argvars, rettv, FALSE); #endif } --- 945,957 ---- rettv->v_type = VAR_STRING; rettv->vval.v_string = NULL; + #ifdef FEAT_CLIENTSERVER if (in_vim9script() && (check_for_string_arg(argvars, 0) == FAIL || check_for_string_arg(argvars, 1) == FAIL || check_for_opt_string_arg(argvars, 2) == FAIL)) return; remote_common(argvars, rettv, FALSE); #endif } *** ../vim-8.2.4604/src/version.c 2022-03-21 19:47:27.908641008 +0000 --- src/version.c 2022-03-21 19:52:05.088700879 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4605, /**/ -- Q: Why do ducks have flat feet? A: To stamp out forest fires. Q: Why do elephants have flat feet? A: To stamp out flaming ducks. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///