To: vim_dev@googlegroups.com Subject: Patch 8.2.0834 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0834 Problem: :drop command in terminal popup causes problems. Solution: Check for using a popup window. (closes #6151) Files: src/ex_cmds.c, src/testdir/test_popupwin.vim *** ../vim-8.2.0833/src/ex_cmds.c 2020-05-13 13:40:12.690995638 +0200 --- src/ex_cmds.c 2020-05-27 23:10:33.811029816 +0200 *************** *** 6349,6354 **** --- 6349,6357 ---- buf_T *buf; tabpage_T *tp; + if (ERROR_IF_POPUP_WINDOW || ERROR_IF_TERM_POPUP_WINDOW) + return; + /* * Check if the first argument is already being edited in a window. If * so, jump to that window. *** ../vim-8.2.0833/src/testdir/test_popupwin.vim 2020-05-18 19:46:00.074602945 +0200 --- src/testdir/test_popupwin.vim 2020-05-27 23:10:33.815029799 +0200 *************** *** 2445,2450 **** --- 2445,2453 ---- call assert_fails('call feedkeys("gf", "xt")', 'E863:') call feedkeys("a\", 'xt') + " Cannot escape from terminal window + call assert_fails('tab drop xxx', 'E863:') + " Cannot open a second one. let termbuf2 = term_start(&shell, #{hidden: 1}) call assert_fails('call popup_create(termbuf2, #{})', 'E861:') *** ../vim-8.2.0833/src/version.c 2020-05-27 22:08:30.127660296 +0200 --- src/version.c 2020-05-27 23:12:51.662517066 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 834, /**/ -- Some of the well known MS-Windows errors: EHUH Unexpected error EUSER User error, not our fault! EGOD Horrible problem, god knows what has happened EERR Errornous error: nothing wrong /// 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 ///