aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-08-15 10:39:41 +0800
committerGitHub <noreply@github.com>2022-08-15 10:39:41 +0800
commita6f0e32d23930b5ab7d5c70d0c58e9964e3af408 (patch)
treed3b03ad0d09022a99f2adc006881a93ed0ebe670 /runtime
parent1c164689a4ef243be2a0e1b4332c9b6c56b5b031 (diff)
parent9ab9eb1220113d247dd1eb089cb6576a135b8699 (diff)
downloadrneovim-a6f0e32d23930b5ab7d5c70d0c58e9964e3af408.tar.gz
rneovim-a6f0e32d23930b5ab7d5c70d0c58e9964e3af408.tar.bz2
rneovim-a6f0e32d23930b5ab7d5c70d0c58e9964e3af408.zip
Merge pull request #19763 from zeertzjq/vim-8.2.1297
vim-patch:8.2.{1297,1653,1658}: expand('<stack>')
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/builtin.txt1
-rw-r--r--runtime/doc/cmdline.txt16
2 files changed, 12 insertions, 5 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 291eea7263..0fc8a30c20 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2010,6 +2010,7 @@ expand({string} [, {nosuf} [, {list}]]) *expand()*
a function
<SID> "<SNR>123_" where "123" is the
current script ID |<SID>|
+ <stack> call stack
<cword> word under the cursor
<cWORD> WORD under the cursor
<client> the {clientid} of the last received
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 87f1589ea1..29eff75bfa 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -879,12 +879,18 @@ Note: these are typed literally, they are not special keys!
*:<sfile>* *<sfile>*
<sfile> When executing a `:source` command, is replaced with the
file name of the sourced file. *E498*
- When executing a function, is replaced with:
- "function {function-name}[{lnum}]"
- function call nesting is indicated like this:
- "function {function-name1}[{lnum}]..{function-name2}[{lnum}]"
+ When executing a function, is replaced with the call stack,
+ as with <stack> (this is for backwards compatibility, using
+ <stack> is preferred).
Note that filename-modifiers are useless when <sfile> is
- used inside a function.
+ not used inside a script.
+ *:<stack>* *<stack>*
+ <stack> is replaced with the call stack, using
+ "function {function-name}[{lnum}]" for a function line
+ and "script {file-name}[{lnum}]" for a script line, and
+ ".." in between items. E.g.:
+ "function {function-name1}[{lnum}]..{function-name2}[{lnum}]"
+ If there is no call stack you get error *E489* .
*:<slnum>* *<slnum>*
<slnum> When executing a `:source` command, is replaced with the
line number. *E842*