To: vim_dev@googlegroups.com Subject: Patch 8.2.2077 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2077 Problem: Build failure with small features. Solution: Add #ifdef. Files: src/structs.h, src/ex_docmd.c *** ../vim-8.2.2076/src/structs.h 2020-12-01 20:12:20.788108786 +0100 --- src/structs.h 2020-12-01 21:46:01.741272234 +0100 *************** *** 4155,4161 **** --- 4155,4163 ---- int save_finish_op; int save_opcount; int save_reg_executing; + #ifdef FEAT_EVAL int save_script_version; + #endif tasave_T tabuf; } save_state_T; *** ../vim-8.2.2076/src/ex_docmd.c 2020-12-01 20:12:20.792108768 +0100 --- src/ex_docmd.c 2020-12-01 21:42:02.154180918 +0100 *************** *** 7994,8005 **** sst->save_finish_op = finish_op; sst->save_opcount = opcount; sst->save_reg_executing = reg_executing; - sst->save_script_version = current_sctx.sc_version; msg_scroll = FALSE; // no msg scrolling in Normal mode restart_edit = 0; // don't go to Insert mode p_im = FALSE; // don't use 'insertmode' current_sctx.sc_version = 1; // not in Vim9 script /* * Save the current typeahead. This is required to allow using ":normal" --- 7994,8007 ---- sst->save_finish_op = finish_op; sst->save_opcount = opcount; sst->save_reg_executing = reg_executing; msg_scroll = FALSE; // no msg scrolling in Normal mode restart_edit = 0; // don't go to Insert mode p_im = FALSE; // don't use 'insertmode' + #ifdef FEAT_EVAL + sst->save_script_version = current_sctx.sc_version; current_sctx.sc_version = 1; // not in Vim9 script + #endif /* * Save the current typeahead. This is required to allow using ":normal" *************** *** 8023,8029 **** --- 8025,8033 ---- opcount = sst->save_opcount; reg_executing = sst->save_reg_executing; msg_didout |= sst->save_msg_didout; // don't reset msg_didout now + #ifdef FEAT_EVAL current_sctx.sc_version = sst->save_script_version; + #endif // Restore the state (needed when called from a function executed for // 'indentexpr'). Update the mouse and cursor, they may have changed. *** ../vim-8.2.2076/src/version.c 2020-12-01 21:27:47.125151362 +0100 --- src/version.c 2020-12-01 21:47:27.004947180 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2077, /**/ -- FATHER: We are here today to witness the union of two young people in the joyful bond of the holy wedlock. Unfortunately, one of them, my son Herbert, has just fallen to his death. [Murmurs from CROWD; the BRIDE smiles with relief, coughs.] "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 ///