summaryrefslogtreecommitdiffstats
path: root/src/testdir
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-22 15:09:36 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-22 15:09:36 +0000
commit5600a709f453045c80f92087acc0f855b4af377a (patch)
tree7a5d7a0ea30f2167bf7a1fd68a93d6c9570c3e6c /src/testdir
parent9530b580a7b71960dbbdb2b12a3aafeb540bd135 (diff)
patch 8.2.4180: 'balloonexpr' is evaluated in the current script contextv8.2.4180
Problem: 'balloonexpr' is evaluated in the current script context. Solution: Use the script context where the option was set.
Diffstat (limited to 'src/testdir')
-rw-r--r--src/testdir/dumps/Test_balloon_eval_term_01.dump2
-rw-r--r--src/testdir/dumps/Test_balloon_eval_term_01a.dump2
-rw-r--r--src/testdir/dumps/Test_balloon_eval_term_02.dump2
-rw-r--r--src/testdir/test_balloon.vim3
4 files changed, 5 insertions, 4 deletions
diff --git a/src/testdir/dumps/Test_balloon_eval_term_01.dump b/src/testdir/dumps/Test_balloon_eval_term_01.dump
index 9ae7006cee..be98212d94 100644
--- a/src/testdir/dumps/Test_balloon_eval_term_01.dump
+++ b/src/testdir/dumps/Test_balloon_eval_term_01.dump
@@ -2,7 +2,7 @@
|t|w|o| |t|X|o| |t|w|o| @38
|t|h|r|e| +0#0000001#ffd7ff255@17| +0#0000000#ffffff0@27
|~+0#4040ff13&| @2| +0#0000001#ffd7ff255|l|i|n|e| |2| |c|o|l|u|m|n| |6|:| | +0#4040ff13#ffffff0@27
-|~| @2| +0#0000001#ffd7ff255|t|X|o| @13| +0#4040ff13#ffffff0@27
+|~| @2| +0#0000001#ffd7ff255|t|X|o|<| @12| +0#4040ff13#ffffff0@27
|~| @2| +0#0000001#ffd7ff255@17| +0#4040ff13#ffffff0@27
|~| @48
|~| @48
diff --git a/src/testdir/dumps/Test_balloon_eval_term_01a.dump b/src/testdir/dumps/Test_balloon_eval_term_01a.dump
index 9ae7006cee..be98212d94 100644
--- a/src/testdir/dumps/Test_balloon_eval_term_01a.dump
+++ b/src/testdir/dumps/Test_balloon_eval_term_01a.dump
@@ -2,7 +2,7 @@
|t|w|o| |t|X|o| |t|w|o| @38
|t|h|r|e| +0#0000001#ffd7ff255@17| +0#0000000#ffffff0@27
|~+0#4040ff13&| @2| +0#0000001#ffd7ff255|l|i|n|e| |2| |c|o|l|u|m|n| |6|:| | +0#4040ff13#ffffff0@27
-|~| @2| +0#0000001#ffd7ff255|t|X|o| @13| +0#4040ff13#ffffff0@27
+|~| @2| +0#0000001#ffd7ff255|t|X|o|<| @12| +0#4040ff13#ffffff0@27
|~| @2| +0#0000001#ffd7ff255@17| +0#4040ff13#ffffff0@27
|~| @48
|~| @48
diff --git a/src/testdir/dumps/Test_balloon_eval_term_02.dump b/src/testdir/dumps/Test_balloon_eval_term_02.dump
index 76a91ae035..51c5e328d3 100644
--- a/src/testdir/dumps/Test_balloon_eval_term_02.dump
+++ b/src/testdir/dumps/Test_balloon_eval_term_02.dump
@@ -3,7 +3,7 @@
|t|h|r|e|e+0&#e0e0e08| |t|h>r+0&#ffffff0|e@1| |t|h|r|e@1| @32
|~+0#4040ff13&| @2| +0#0000001#ffd7ff255@17| +0#4040ff13#ffffff0@27
|~| @2| +0#0000001#ffd7ff255|l|i|n|e| |3| |c|o|l|u|m|n| |5|:| | +0#4040ff13#ffffff0@27
-|~| @2| +0#0000001#ffd7ff255|e| |t|h|r| @11| +0#4040ff13#ffffff0@27
+|~| @2| +0#0000001#ffd7ff255|e| |t|h|r|<| @10| +0#4040ff13#ffffff0@27
|~| @2| +0#0000001#ffd7ff255@17| +0#4040ff13#ffffff0@27
|~| @48
|~| @48
diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim
index 319e54601e..ed0c6c1936 100644
--- a/src/testdir/test_balloon.vim
+++ b/src/testdir/test_balloon.vim
@@ -10,7 +10,8 @@ CheckScreendump
let s:common_script =<< trim [CODE]
call setline(1, ["one one one", "two tXo two", "three three three"])
- set balloonevalterm balloonexpr=MyBalloonExpr() balloondelay=100
+ set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100
+ let s:trailing = '<' " check that script context is set
func MyBalloonExpr()
return "line " .. v:beval_lnum .. " column " .. v:beval_col .. ":\n" .. v:beval_text
endfun