To: vim_dev@googlegroups.com Subject: Patch 8.2.5137 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.5137 Problem: Cannot build without the +channel feature. (Dominique Pellé) Solution: Add #ifdef around ch_log() calls. (closes #10598) Files: src/os_unix.c, src/regexp_nfa.c, src/regexp_bt.c *** ../vim-8.2.5136/src/os_unix.c 2022-06-19 14:36:31.798347408 +0100 --- src/os_unix.c 2022-06-20 11:19:04.370979996 +0100 *************** *** 8323,8330 **** --- 8323,8332 ---- timer_created = TRUE; } + # ifdef FEAT_JOB_CHANNEL ch_log(NULL, "setting timeout timer to %d sec %ld nsec", (int)interval.it_value.tv_sec, (long)interval.it_value.tv_nsec); + # endif ret = timer_settime(timer_id, 0, &interval, NULL); if (ret < 0) semsg(_(e_could_not_set_timeout_str), strerror(errno)); *** ../vim-8.2.5136/src/regexp_nfa.c 2022-06-17 15:17:06.304400375 +0100 --- src/regexp_nfa.c 2022-06-20 11:20:50.711163619 +0100 *************** *** 4248,4255 **** --- 4248,4257 ---- { if (nfa_timed_out != NULL) { + # ifdef FEAT_JOB_CHANNEL if (!*nfa_timed_out) ch_log(NULL, "NFA regexp timed out"); + # endif *nfa_timed_out = TRUE; } return TRUE; *** ../vim-8.2.5136/src/regexp_bt.c 2022-06-17 15:17:06.304400375 +0100 --- src/regexp_bt.c 2022-06-20 11:20:30.803130732 +0100 *************** *** 3163,3170 **** --- 3163,3172 ---- { if (timed_out != NULL) { + # ifdef FEAT_JOB_CHANNEL if (!*timed_out) ch_log(NULL, "BT regexp timed out"); + # endif *timed_out = TRUE; } return TRUE; *** ../vim-8.2.5136/src/version.c 2022-06-19 20:13:52.335051630 +0100 --- src/version.c 2022-06-20 11:21:23.251216011 +0100 *************** *** 736,737 **** --- 736,739 ---- { /* Add new patch number below this line */ + /**/ + 5137, /**/ -- FIRST VILLAGER: We have found a witch. May we burn her? "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/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///