diff options
Diffstat (limited to 'data/vim/patches/8.1.0792')
| -rw-r--r-- | data/vim/patches/8.1.0792 | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/data/vim/patches/8.1.0792 b/data/vim/patches/8.1.0792 deleted file mode 100644 index 3c04fd126..000000000 --- a/data/vim/patches/8.1.0792 +++ /dev/null @@ -1,87 +0,0 @@ -To: vim_dev@googlegroups.com -Subject: Patch 8.1.0792 -Fcc: outbox -From: Bram Moolenaar <Bram@moolenaar.net> -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit ------------- - -Patch 8.1.0792 -Problem: Popup menu is displayed on top of the cmdline window if it is - opened from Insert completion. (Bjorn Linse) -Solution: Remove the popup menu. Restore the cursor position. - (closes #3838) -Files: src/edit.c, src/ex_getln.c - - -*** ../vim-8.1.0791/src/edit.c 2019-01-19 17:43:03.401449251 +0100 ---- src/edit.c 2019-01-22 22:04:03.005446245 +0100 -*************** -*** 8537,8542 **** ---- 8537,8543 ---- - ++no_u_sync; - if (regname == '=') - { -+ pos_T curpos = curwin->w_cursor; - # ifdef HAVE_INPUT_METHOD - int im_on = im_get_status(); - # endif -*************** -*** 8545,8552 **** - u_sync_once = 2; - - regname = get_expr_register(); - # ifdef HAVE_INPUT_METHOD -! /* Restore the Input Method. */ - if (im_on) - im_set_active(TRUE); - # endif ---- 8546,8557 ---- - u_sync_once = 2; - - regname = get_expr_register(); -+ -+ // Cursor may be moved back a column. -+ curwin->w_cursor = curpos; -+ check_cursor(); - # ifdef HAVE_INPUT_METHOD -! // Restore the Input Method. - if (im_on) - im_set_active(TRUE); - # endif -*** ../vim-8.1.0791/src/ex_getln.c 2019-01-19 17:43:03.409449198 +0100 ---- src/ex_getln.c 2019-01-22 21:52:42.526460299 +0100 -*************** -*** 7268,7273 **** ---- 7268,7277 ---- - /* Don't execute autocommands while creating the window. */ - block_autocmds(); - -+ // When using completion in Insert mode with <C-R>=<C-F> one can open the -+ // command line window, but we don't want the popup menu then. -+ pum_undisplay(); -+ - /* don't use a new tab page */ - cmdmod.tab = 0; - cmdmod.noswapfile = 1; -*** ../vim-8.1.0791/src/version.c 2019-01-22 21:45:36.553678901 +0100 ---- src/version.c 2019-01-22 22:07:18.600017151 +0100 -*************** -*** 793,794 **** ---- 793,796 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 792, - /**/ - --- -FIRST HEAD: Oh! quick! get the sword out I want to cut his head off. -THIRD HEAD: Oh, cut your own head off. -SECOND HEAD: Yes - do us all a favour. - "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/ \\\ -\\\ an exciting new programming language -- http://www.Zimbu.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |