To: vim_dev@googlegroups.com Subject: Patch 8.1.2049 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2049 (after 8.1.2048) Problem: Cannot build tiny version. Solution: Add #ifdefs. Files: src/main.c *** ../vim-8.1.2048/src/main.c 2019-09-17 20:28:34.148873666 +0200 --- src/main.c 2019-09-17 20:53:19.456620826 +0200 *************** *** 1061,1071 **** --- 1061,1073 ---- && scriptin[curscript] == NULL && !global_busy; + #ifdef FEAT_JOB_CHANNEL if (was_safe != is_safe) // Only log when the state changes, otherwise it happens at nearly // every key stroke. ch_log(NULL, is_safe ? "Start triggering SafeState" : "Stop triggering SafeState"); + #endif if (is_safe) apply_autocmds(EVENT_SAFESTATE, NULL, NULL, FALSE, curbuf); was_safe = is_safe; *************** *** 1079,1086 **** --- 1081,1090 ---- void state_no_longer_safe(void) { + #ifdef FEAT_JOB_CHANNEL if (was_safe) ch_log(NULL, "safe state reset"); + #endif was_safe = FALSE; } *************** *** 1093,1103 **** --- 1097,1111 ---- { if (was_safe) { + #ifdef FEAT_JOB_CHANNEL ch_log(NULL, "Leaving unsafe area, triggering SafeStateAgain"); + #endif apply_autocmds(EVENT_SAFESTATEAGAIN, NULL, NULL, FALSE, curbuf); } + #ifdef FEAT_JOB_CHANNEL else ch_log(NULL, "Leaving unsafe area, not triggering SafeStateAgain"); + #endif } *** ../vim-8.1.2048/src/version.c 2019-09-17 20:28:34.148873666 +0200 --- src/version.c 2019-09-17 20:54:10.880495648 +0200 *************** *** 759,760 **** --- 759,762 ---- { /* Add new patch number below this line */ + /**/ + 2049, /**/ -- Microsoft: "Windows NT 4.0 now has the same user-interface as Windows 95" Windows 95: "Press CTRL-ALT-DEL to reboot" Windows NT 4.0: "Press CTRL-ALT-DEL to login" /// 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 ///