Merge remote-tracking branch 'Delapouite/user-mode-lock'

10 files changed, 11 insertions, 5 deletions

diff --git a/test/normal/user-modes/cmd b/test/normal/user-modes/cmd
deleted file mode 100644
index 455c6ded..00000000
--- a/test/normal/user-modes/cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-:declare-user-mode global foo<ret>
-:map global foo f '<esc>wchello from foo<esc>'
-:enter-user-mode global foo
-f
diff --git a/test/normal/user-modes/lock/cmd b/test/normal/user-modes/lock/cmd
new file mode 100644
index 00000000..8c169dd5
--- /dev/null
+++ b/test/normal/user-modes/lock/cmd
@@ -0,0 +1 @@
+<a-,>fff<esc>f
diff --git a/test/normal/user-modes/lock/in b/test/normal/user-modes/lock/in
new file mode 100644
index 00000000..28076c78
--- /dev/null
+++ b/test/normal/user-modes/lock/in
@@ -0,0 +1 @@
+123delete
diff --git a/test/normal/user-modes/lock/out b/test/normal/user-modes/lock/out
new file mode 100644
index 00000000..c8b1b423
--- /dev/null
+++ b/test/normal/user-modes/lock/out
@@ -0,0 +1 @@
+delete
diff --git a/test/normal/user-modes/lock/rc b/test/normal/user-modes/lock/rc
new file mode 100644
index 00000000..b3114fef
--- /dev/null
+++ b/test/normal/user-modes/lock/rc
@@ -0,0 +1,3 @@
+declare-user-mode global foo
+map global foo f d
+map global normal <a-,> ':enter-user-mode -lock global foo<ret>'
diff --git a/test/normal/user-modes/once/cmd b/test/normal/user-modes/once/cmd
new file mode 100644
index 00000000..c86211cb
--- /dev/null
+++ b/test/normal/user-modes/once/cmd
@@ -0,0 +1 @@
+<a-,>ff
diff --git a/test/normal/user-modes/in b/test/normal/user-modes/once/in
index 5716ca59..5716ca59 100644
--- a/test/normal/user-modes/in
+++ b/test/normal/user-modes/once/in
diff --git a/test/normal/user-modes/out b/test/normal/user-modes/once/out
index 196f02f0..196f02f0 100644
--- a/test/normal/user-modes/out
+++ b/test/normal/user-modes/once/out
diff --git a/test/normal/user-modes/once/rc b/test/normal/user-modes/once/rc
new file mode 100644
index 00000000..102a6163
--- /dev/null
+++ b/test/normal/user-modes/once/rc
@@ -0,0 +1,3 @@
+declare-user-mode global foo
+map global foo f 'wchello from foo<esc>'
+map global normal <a-,> ':enter-user-mode global foo<ret>'
diff --git a/test/run b/test/run
index 661d3cf7..67367d9f 100755
--- a/test/run
+++ b/test/run
@@ -19,7 +19,7 @@ main() {
             eval -buffer *debug* write debug
             quit!
         }
-        try %{ exec "%sh{cat cmd}" }
+        try %{ exec -with-maps "%sh{cat cmd}" }
         exec <c-l>
         eval -buffer *debug* write debug
         nop %sh{