To: vim_dev@googlegroups.com Subject: Patch 8.2.0616 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0616 Problem: Build error when disabling the diff feature. Solution: Move parenthesis outside of #ifdef. (Tom Ryder) Files: src/drawline.c *** ../vim-8.2.0615/src/drawline.c 2020-03-27 20:58:33.345005916 +0100 --- src/drawline.c 2020-04-21 22:21:34.755090415 +0200 *************** *** 3095,3103 **** #ifdef FEAT_SYN_HL if (!(cul_screenline # ifdef FEAT_DIFF ! && diff_hlf == (hlf_T)0) # endif ! ) saved_char_attr = char_attr; else #endif --- 3095,3103 ---- #ifdef FEAT_SYN_HL if (!(cul_screenline # ifdef FEAT_DIFF ! && diff_hlf == (hlf_T)0 # endif ! )) saved_char_attr = char_attr; else #endif *** ../vim-8.2.0615/src/version.c 2020-04-21 22:19:26.059486839 +0200 --- src/version.c 2020-04-21 22:23:02.866836002 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 616, /**/ -- I think that you'll agree that engineers are very effective in their social interactions. It's the "normal" people who are nuts. (Scott Adams - The Dilbert principle) /// 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 ///