aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2023-09-25 11:34:05 +0200
committerGitHub <noreply@github.com>2023-09-25 11:34:05 +0200
commitccd1a84a9655279230be15630d4e5978c806c4e1 (patch)
tree652728dfd8f0c99ce92b05efd8396e61ab124fe9
parentdb51548036ebe4b01c5b78aeca7a76aa71ab4fbe (diff)
parentfdcb74fc4ba2159d5425849560dda97224f5bff4 (diff)
downloadrneovim-ccd1a84a9655279230be15630d4e5978c806c4e1.tar.gz
rneovim-ccd1a84a9655279230be15630d4e5978c806c4e1.tar.bz2
rneovim-ccd1a84a9655279230be15630d4e5978c806c4e1.zip
Merge pull request #25344 from gpanders/doc-shortmess
docs: remove "f" from default 'shortmess' value
-rw-r--r--runtime/doc/editing.txt4
-rw-r--r--runtime/doc/options.txt2
-rw-r--r--runtime/lua/vim/_meta/options.lua2
-rw-r--r--src/nvim/options.lua2
4 files changed, 4 insertions, 6 deletions
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 2225e6e753..363d8a5568 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -820,12 +820,10 @@ by the shell before executing the find program.
When there is an argument list you can see which file you are editing in the
title of the window (if there is one and 'title' is on) and with the file
message you get with the "CTRL-G" command. You will see something like
- (file 4 of 11)
-If 'shortmess' contains 'f' it will be
(4 of 11)
If you are not really editing the file at the current position in the argument
list it will be
- (file (4) of 11)
+ ((4) of 11)
This means that you are position 4 in the argument list, but not editing the
fourth file in the argument list. This happens when you do ":e file".
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b26c181f28..5e91bd8666 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5383,7 +5383,7 @@ A jump table for the options with a short description can be found at |Q_op|.
function to get the effective shiftwidth value.
*'shortmess'* *'shm'* *E1336*
-'shortmess' 'shm' string (default "filnxtToOCF")
+'shortmess' 'shm' string (default "ilnxtToOCF")
global
This option helps to avoid all the |hit-enter| prompts caused by file
messages, for example with CTRL-G, and to avoid some other messages.
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index f8a51da9b5..461bf95610 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -5719,7 +5719,7 @@ vim.bo.sw = vim.bo.shiftwidth
--- shm=at Abbreviation, and truncate message when necessary.
---
--- @type string
-vim.o.shortmess = "filnxtToOCF"
+vim.o.shortmess = "ilnxtToOCF"
vim.o.shm = vim.o.shortmess
vim.go.shortmess = vim.o.shortmess
vim.go.shm = vim.go.shortmess
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 258145e85e..f0e4a5a1f4 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -7239,7 +7239,7 @@ return {
{
abbreviation = 'shm',
cb = 'did_set_shortmess',
- defaults = { if_true = 'filnxtToOCF' },
+ defaults = { if_true = 'ilnxtToOCF' },
desc = [=[
This option helps to avoid all the |hit-enter| prompts caused by file
messages, for example with CTRL-G, and to avoid some other messages.