# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1653575402 -7200
# Node ID 7d28903e80df530792a096c90e08b604d0027e8c
# Parent  3ac43f48f00116e130d5a4c209aa9c691cc13e0a
patch 8.2.5022: 'completefunc'/'omnifunc' error does not end completion

Commit: https://github.com/vim/vim/commit/9bcb9ca9c7dd1632385dc3351b5e019739368658
Author: LemonBoy <thatlemon@gmail.com>
Date:   Thu May 26 15:23:26 2022 +0100

    patch 8.2.5022: 'completefunc'/'omnifunc' error does not end completion

    Problem:    'completefunc'/'omnifunc' error does not end completion.
    Solution:   Check if there was an error or exception. (closes https://github.com/vim/vim/issues/10486,
                closes #4218)

diff --git a/src/insexpand.c b/src/insexpand.c
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -4522,11 +4522,12 @@ get_userdefined_compl_info(colnr_T curs_
 	return FAIL;
     }
 
-    // Return value -2 means the user complete function wants to
-    // cancel the complete without an error.
+    // Return value -2 means the user complete function wants to cancel the
+    // complete without an error, do the same if the function did not execute
+    // successfully.
+    if (col == -2 || aborting())
+	return FAIL;
     // Return value -3 does the same as -2 and leaves CTRL-X mode.
-    if (col == -2)
-	return FAIL;
     if (col == -3)
     {
 	ctrl_x_mode = CTRL_X_NORMAL;
diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -140,6 +140,30 @@ func Test_omni_dash()
   set omnifunc=
 endfunc
 
+func Test_omni_throw()
+  let g:CallCount = 0
+  func Omni(findstart, base)
+    let g:CallCount += 1
+    if a:findstart
+      throw "he he he"
+    endif
+  endfunc
+  set omnifunc=Omni
+  new
+  try
+    exe "normal ifoo\<C-x>\<C-o>"
+    call assert_false(v:true, 'command should have failed')
+  catch
+    call assert_exception('he he he')
+    call assert_equal(1, g:CallCount)
+  endtry
+
+  bwipe!
+  delfunc Omni
+  unlet g:CallCount
+  set omnifunc=
+endfunc
+
 func Test_omni_autoload()
   let save_rtp = &rtp
   set rtp=Xruntime/some
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5022,
+/**/
     5021,
 /**/
     5020,