summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_mapping.vim56
-rw-r--r--src/version.c2
2 files changed, 58 insertions, 0 deletions
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 61a1edd4a..a361b2fdc 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -11,6 +11,62 @@ func Test_abbreviation()
set nomodified
endfunc
+func Test_abclear()
+ abbrev foo foobar
+ iabbrev fooi foobari
+ cabbrev fooc foobarc
+ call assert_equal("\n\n"
+ \ .. "c fooc foobarc\n"
+ \ .. "i fooi foobari\n"
+ \ .. "! foo foobar", execute('abbrev'))
+
+ iabclear
+ call assert_equal("\n\n"
+ \ .. "c fooc foobarc\n"
+ \ .. "c foo foobar", execute('abbrev'))
+ abbrev foo foobar
+ iabbrev fooi foobari
+
+ cabclear
+ call assert_equal("\n\n"
+ \ .. "i fooi foobari\n"
+ \ .. "i foo foobar", execute('abbrev'))
+ abbrev foo foobar
+ cabbrev fooc foobarc
+
+ abclear
+ call assert_equal("\n\nNo abbreviation found", execute('abbrev'))
+endfunc
+
+func Test_abclear_buffer()
+ abbrev foo foobar
+ new X1
+ abbrev <buffer> foo1 foobar1
+ new X2
+ abbrev <buffer> foo2 foobar2
+
+ call assert_equal("\n\n"
+ \ .. "! foo2 @foobar2\n"
+ \ .. "! foo foobar", execute('abbrev'))
+
+ abclear <buffer>
+ call assert_equal("\n\n"
+ \ .. "! foo foobar", execute('abbrev'))
+
+ b X1
+ call assert_equal("\n\n"
+ \ .. "! foo1 @foobar1\n"
+ \ .. "! foo foobar", execute('abbrev'))
+ abclear <buffer>
+ call assert_equal("\n\n"
+ \ .. "! foo foobar", execute('abbrev'))
+
+ abclear
+ call assert_equal("\n\nNo abbreviation found", execute('abbrev'))
+
+ %bwipe
+endfunc
+
func Test_map_ctrl_c_insert()
" mapping of ctrl-c in Insert mode
set cpo-=< cpo-=k
diff --git a/src/version.c b/src/version.c
index 48e8d99e8..d3635b06b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1199,
+/**/
1198,
/**/
1197,