diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/editing.txt | 16 | ||||
| -rw-r--r-- | runtime/doc/news.txt | 7 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 7 | ||||
| -rw-r--r-- | runtime/doc/usr_02.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 2 | ||||
| -rw-r--r-- | runtime/lua/vim/_meta/options.lua | 7 |
6 files changed, 17 insertions, 24 deletions
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 363d8a5568..2f44256138 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -539,10 +539,10 @@ set to "dos", otherwise it is set to "unix". When 'fileformats' includes "mac". If the 'fileformat' option is set to "dos" on non-MS-Windows systems the -message "[dos format]" is shown to remind you that something unusual is -happening. On MS-Windows systems you get the message "[unix format]" if -'fileformat' is set to "unix". On all systems but the Macintosh you get the -message "[mac format]" if 'fileformat' is set to "mac". +message "[dos]" is shown to remind you that something unusual is happening. On +MS-Windows systems you get the message "[unix]" if 'fileformat' is set to +"unix". On all systems you get the message "[mac]" if 'fileformat' is set to +"mac". If the 'fileformats' option is empty and DOS format is used, but while reading a file some lines did not end in <CR><NL>, "[CR missing]" will be included in @@ -1056,14 +1056,14 @@ lost the original file. *DOS-format-write* If the 'fileformat' is "dos", <CR><NL> is used for <EOL>. This is default -for Windows. On other systems the message "[dos format]" is shown to +for Windows. On other systems the message "[dos]" is shown to remind you that an unusual <EOL> was used. *Unix-format-write* If the 'fileformat' is "unix", <NL> is used for <EOL>. On Windows -the message "[unix format]" is shown. +the message "[unix]" is shown. *Mac-format-write* -If the 'fileformat' is "mac", <CR> is used for <EOL>. On non-Mac systems the -message "[mac format]" is shown. +If the 'fileformat' is "mac", <CR> is used for <EOL>. The +message "[mac]" is shown. See also |file-formats| and the 'fileformat' and 'fileformats' options. diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt index 5e257372bc..05a2d35f9a 100644 --- a/runtime/doc/news.txt +++ b/runtime/doc/news.txt @@ -247,8 +247,11 @@ The following deprecated functions or APIs were removed. • Support for legacy treesitter injection queries is removed. -• 'shortmess' flags: - - |shm-f| is removed. Always uses "(3 of 5)", never "(file 3 of 5)" +• Removed 'shortmess' flags: + - |shm-f|. Always uses "(3 of 5)", never "(file 3 of 5)" + - |shm-i|. Always use "[noeol]". + - |shm-x|. Always use "[dos]", "[unix]" and "[mac]" + - |shm-n|. Always use "[New]". ============================================================================== DEPRECATIONS *news-deprecations* diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 5e91bd8666..0bbbc95141 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -5383,22 +5383,17 @@ 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 "ilnxtToOCF") +'shortmess' 'shm' string (default "ltToOCF") 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. It is a list of flags: flag meaning when present ~ - i use "[noeol]" instead of "[Incomplete last line]" *shm-i* l use "999L, 888B" instead of "999 lines, 888 bytes" *shm-l* m use "[+]" instead of "[Modified]" *shm-m* - n use "[New]" instead of "[New File]" *shm-n* r use "[RO]" instead of "[readonly]" *shm-r* w use "[w]" instead of "written" for file write message *shm-w* and "[a]" instead of "appended" for ':w >> file' command - x use "[dos]" instead of "[dos format]", "[unix]" *shm-x* - instead of "[unix format]" and "[mac]" instead of "[mac - format]" a all of the above abbreviations *shm-a* o overwrite message for writing a file with subsequent *shm-o* diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt index 259bb41200..1fc612de26 100644 --- a/runtime/doc/usr_02.txt +++ b/runtime/doc/usr_02.txt @@ -40,7 +40,7 @@ blank window. This is what your screen will look like: |~ | |~ | |~ | - |"file.txt" [New file] | + |"file.txt" [New] | +---------------------------------------+ ('#' is the cursor position.) < diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 8f339379bf..e636746616 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -731,7 +731,7 @@ Options: Everything is allowed in 'exrc' files since they must be explicitly marked trusted. *'shelltype'* - 'shortmess' *shm-f* flag (always on, never show "file" in "(3 of 5)") + 'shortmess' flags: *shm-f* *shm-n* *shm-x* *shm-i* (behave like always on) *'shortname'* *'sn'* *'noshortname'* *'nosn'* *'swapsync'* *'sws'* *'termencoding'* *'tenc'* (Vim 7.4.852 also removed this for Windows) diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua index 461bf95610..6ef3cf57e1 100644 --- a/runtime/lua/vim/_meta/options.lua +++ b/runtime/lua/vim/_meta/options.lua @@ -5666,16 +5666,11 @@ vim.bo.sw = vim.bo.shiftwidth --- messages, for example with CTRL-G, and to avoid some other messages. --- It is a list of flags: --- flag meaning when present ~ ---- i use "[noeol]" instead of "[Incomplete last line]" *shm-i* --- l use "999L, 888B" instead of "999 lines, 888 bytes" *shm-l* --- m use "[+]" instead of "[Modified]" *shm-m* ---- n use "[New]" instead of "[New File]" *shm-n* --- r use "[RO]" instead of "[readonly]" *shm-r* --- w use "[w]" instead of "written" for file write message *shm-w* --- and "[a]" instead of "appended" for ':w >> file' command ---- x use "[dos]" instead of "[dos format]", "[unix]" *shm-x* ---- instead of "[unix format]" and "[mac]" instead of "[mac ---- format]" --- a all of the above abbreviations *shm-a* --- --- o overwrite message for writing a file with subsequent *shm-o* @@ -5719,7 +5714,7 @@ vim.bo.sw = vim.bo.shiftwidth --- shm=at Abbreviation, and truncate message when necessary. --- --- @type string -vim.o.shortmess = "ilnxtToOCF" +vim.o.shortmess = "ltToOCF" vim.o.shm = vim.o.shortmess vim.go.shortmess = vim.o.shortmess vim.go.shm = vim.go.shortmess |