aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-12-01 17:02:49 +0100
committerGitHub <noreply@github.com>2018-12-01 17:02:49 +0100
commit715fdfee1ed567290639e6d55a1a903811f9e2e6 (patch)
treee94e44ac97dde9f3adcef35c13ee8db23dd42d96 /runtime
parentfeec926633e317577b0a3a63cc0fb352c0ba77b8 (diff)
parent30940f809b1e6dbd4de4f3e76fdb5336d06cd20a (diff)
downloadrneovim-715fdfee1ed567290639e6d55a1a903811f9e2e6.tar.gz
rneovim-715fdfee1ed567290639e6d55a1a903811f9e2e6.tar.bz2
rneovim-715fdfee1ed567290639e6d55a1a903811f9e2e6.zip
Merge #9297 from justinmk/confirm-dialog
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/deprecated.txt1
-rw-r--r--runtime/doc/eval.txt16
-rw-r--r--runtime/doc/various.txt11
3 files changed, 4 insertions, 24 deletions
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 92a6bd6b4f..4369ad7894 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -37,6 +37,7 @@ Functions ~
*file_readable()* Obsolete name for |filereadable()|.
*highlight_exists()* Obsolete name for |hlexists()|.
*highlightID()* Obsolete name for |hlID()|.
+*inputdialog()* Use |input()| instead.
*jobclose()* Obsolete name for |chanclose()|
*jobsend()* Obsolete name for |chansend()|
*last_buffer_nr()* Obsolete name for bufnr("$").
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 91986a9442..9bd73df7fe 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2137,8 +2137,6 @@ index({list}, {expr} [, {start} [, {ic}]])
Number index in {list} where {expr} appears
input({prompt} [, {text} [, {completion}]])
String get input from the user
-inputdialog({prompt} [, {text} [, {completion}]])
- String like input() but in a GUI dialog
inputlist({textlist}) Number let the user pick from a choice list
inputrestore() Number restore typeahead
inputsave() Number save and clear typeahead
@@ -4915,20 +4913,6 @@ input({opts})
: call inputrestore()
:endfunction
-inputdialog({prompt} [, {text} [, {cancelreturn}]]) *inputdialog()*
-inputdialog({opts})
- Like |input()|, but when the GUI is running and text dialogs
- are supported, a dialog window pops up to input the text.
- Example: >
- :let n = inputdialog("value for shiftwidth", shiftwidth())
- :if n != ""
- : let &sw = n
- :endif
-< When the dialog is cancelled {cancelreturn} is returned. When
- omitted an empty string is returned.
- Hitting <Enter> works like pressing the OK button. Hitting
- <Esc> works like pressing the Cancel button.
-
inputlist({textlist}) *inputlist()*
{textlist} must be a |List| of strings. This |List| is
displayed, one string per line. The user will be prompted to
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 5f40ccf2ec..d78dd90f18 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -517,14 +517,9 @@ m *+xim* X input method |xim|
:silent! /^begin
:if v:errmsg != ""
: ... pattern was not found
-< ":silent" will also avoid the hit-enter prompt. When
- using this for an external command, this may cause the
- screen to be messed up. Use |CTRL-L| to clean it up
- then.
- ":silent menu ..." defines a menu that will not echo a
- Command-line command. The command will still produce
- messages though. Use ":silent" in the command itself
- to avoid that: ":silent menu .... :silent command".
+< ":silent" also skips the hit-enter prompt.
+ Dialogs that prompt for user input (|confirm()|,
+ 'swapfile', …) are never silent.
*:uns* *:unsilent*
:uns[ilent] {command} Execute {command} not silently. Only makes a