To: vim_dev@googlegroups.com Subject: Patch 8.2.1107 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1107 Problem: 'imactivatefunc' and 'imstatusfunc' are not used in the GUI. Solution: Adjust the #ifdefs. (closes #6367) Files: runtime/doc/options.txt, src/gui_xim.c, src/testdir/test_iminsert.vim *** ../vim-8.2.1106/runtime/doc/options.txt 2020-06-12 20:19:37.972526321 +0200 --- runtime/doc/options.txt 2020-07-01 15:09:08.440790886 +0200 *************** *** 4132,4138 **** global This option specifies a function that will be called to activate or deactivate the Input Method. ! It is not used in the GUI. The expression will be evaluated in the |sandbox| when set from a modeline, see |sandbox-option|. --- 4133,4139 ---- global This option specifies a function that will be called to activate or deactivate the Input Method. ! It is not used in the MS-Windows GUI version. The expression will be evaluated in the |sandbox| when set from a modeline, see |sandbox-option|. *************** *** 4241,4247 **** global This option specifies a function that is called to obtain the status of Input Method. It must return a positive number when IME is active. ! It is not used in the GUI. Example: > function ImStatusFunc() --- 4242,4248 ---- global This option specifies a function that is called to obtain the status of Input Method. It must return a positive number when IME is active. ! It is not used in the MS-Windows GUI version. Example: > function ImStatusFunc() *** ../vim-8.2.1106/src/gui_xim.c 2020-06-02 22:24:33.153439212 +0200 --- src/gui_xim.c 2020-07-01 15:11:04.800231298 +0200 *************** *** 57,63 **** } #endif ! #ifdef FEAT_GUI # define USE_IMACTIVATEFUNC (!gui.in_use && *p_imaf != NUL) # define USE_IMSTATUSFUNC (!gui.in_use && *p_imsf != NUL) #else --- 57,63 ---- } #endif ! #if defined(FEAT_GUI_MSWIN) # define USE_IMACTIVATEFUNC (!gui.in_use && *p_imaf != NUL) # define USE_IMSTATUSFUNC (!gui.in_use && *p_imsf != NUL) #else *** ../vim-8.2.1106/src/testdir/test_iminsert.vim 2020-06-20 16:05:29.012185251 +0200 --- src/testdir/test_iminsert.vim 2020-07-01 15:09:08.440790886 +0200 *************** *** 27,33 **** set imactivatefunc= set imstatusfunc= ! let expected = has('gui_running') ? 0 : 1 call assert_equal(expected, s:imactivatefunc_called) call assert_equal(expected, s:imstatusfunc_called) endfunc --- 27,33 ---- set imactivatefunc= set imstatusfunc= ! let expected = has('gui_win32') ? 0 : 1 call assert_equal(expected, s:imactivatefunc_called) call assert_equal(expected, s:imstatusfunc_called) endfunc *************** *** 38,47 **** elseif !has('gui_mac') CheckFeature xim endif ! if has('gui_running') ! if !has('win32') ! throw 'Skipped: running in the GUI, only works on MS-Windows' ! endif set imactivatefunc= set imstatusfunc= else --- 38,44 ---- elseif !has('gui_mac') CheckFeature xim endif ! if has('gui_win32') set imactivatefunc= set imstatusfunc= else *** ../vim-8.2.1106/src/version.c 2020-07-01 14:38:05.205300206 +0200 --- src/version.c 2020-07-01 15:09:42.476627281 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1107, /**/ -- THEOREM: VI is perfect. PROOF: VI in roman numerals is 6. The natural numbers < 6 which divide 6 are 1, 2, and 3. 1+2+3 = 6. So 6 is a perfect number. Therefore, VI is perfect. QED -- Arthur Tateishi /// 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 ///