To: vim_dev@googlegroups.com Subject: Patch 9.0.1102 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1102 Problem: Complicated use of #ifdef. Solution: Simplify #ifdef use. (Ken Takata, closes #11745) Files: src/if_python3.c *** ../vim-9.0.1101/src/if_python3.c 2022-11-14 15:31:04.041587447 +0000 --- src/if_python3.c 2022-12-26 14:43:21.233406000 +0000 *************** *** 1167,1180 **** // Catch exit() called in Py_Initialize(). hook_py_exit(); if (setjmp(exit_hook_jump_buf) == 0) - #endif { Py_Initialize(); - #ifdef HOOK_EXIT restore_py_exit(); - #endif } - #ifdef HOOK_EXIT else { // exit() was called in Py_Initialize(). --- 1167,1176 ---- *************** *** 1182,1187 **** --- 1178,1185 ---- emsg(_(e_critical_error_in_python3_initialization_check_your_installation)); goto fail; } + #else + Py_Initialize(); #endif #if PY_VERSION_HEX < 0x03090000 *** ../vim-9.0.1101/src/version.c 2022-12-26 14:37:40.432187694 +0000 --- src/version.c 2022-12-26 14:46:09.861747115 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1102, /**/ -- My girlfriend told me I should be more affectionate. So I got TWO girlfriends. /// 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 ///