aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/doc/eval.txt4
-rw-r--r--runtime/doc/options.txt2
-rw-r--r--runtime/doc/term.txt10
-rw-r--r--runtime/doc/vim_diff.txt2
-rw-r--r--src/nvim/fileio.c2
5 files changed, 5 insertions, 15 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index a70e400640..deae268f56 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -3916,10 +3916,6 @@ getchar([expr]) *getchar()*
exe "normal " . v:mouse_col . "|"
endif
<
- When using bracketed paste only the first character is
- returned, the rest of the pasted text is dropped.
- |xterm-bracketed-paste|.
-
There is no prompt, you will somehow have to make clear to the
user that a character has to be typed.
There is no mapping for the character.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 6684626487..cef966e8a3 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4378,7 +4378,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'paste'* *'nopaste'*
'paste' boolean (default off)
global
- You probably don't have to set this option: |bracketed-paste-mode|.
+ This option is obsolete; |bracketed-paste-mode| is built-in.
Put Vim in Paste mode. This is useful if you want to cut or copy
some text from one window and paste it in Vim. This will avoid
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 214975c5a1..4b96dd3330 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -221,13 +221,9 @@ Bracketed paste mode allows terminal emulators to distinguish between typed
text and pasted text.
For terminal emulators that support it, this mode is enabled by default. Thus
-you can paste text without Neovim giving any special meaning to it. Most
-notably it won't try reindenting those lines.
-
-If your terminal emulator doesn't support it yet, you can get the old Vim
-behaviour by enabling |'paste'| temporarily.
-
-NOTE: See https://cirw.in/blog/bracketed-paste for technical details.
+you can paste text without Nvim giving any special meaning to it, e.g. it will
+not auto-indent the pasted text. See https://cirw.in/blog/bracketed-paste for
+technical details.
*mouse-mode-table* *mouse-overview*
A short overview of what the mouse buttons do, when 'mousemodel' is "extend":
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 03feb47cbd..4c5f6815d7 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -100,8 +100,6 @@ editor. Even "legacy" Python and Ruby plugins which use the old Vim interfaces
FEATURES ~
-|bracketed-paste-mode| is built-in and enabled by default.
-
|META| (ALT) chords are recognized, even in the terminal. Any |<M-| mapping
will work. Some examples: <M-1>, <M-2>, <M-BS>, <M-Del>, <M-Ins>, <M-/>,
<M-\>, <M-Space>, <M-Enter>, <M-=>, <M-->, <M-?>, <M-$>, ...
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 3e062aecc0..4063277403 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -4659,7 +4659,7 @@ int vim_rename(const char_u *from, const char_u *to)
return -1;
}
- // Avoid xmalloc() here as vim_rename() is called by buf_write() when neovim
+ // Avoid xmalloc() here as vim_rename() is called by buf_write() when nvim
// is `preserve_exit()`ing.
buffer = try_malloc(BUFSIZE);
if (buffer == NULL) {