mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:partial 2d8ed0203aed (#18675)

Browse Source 
* vim-patch:partial 2d8ed0203aed

Update runtime files.
2d8ed0203a

Skip:

runtime/doc/map.txt
runtime/doc/syntax.txt
runtime/doc/usr_51.txt
runtime/doc/usr_52.txt
runtime/syntax/help.vim
runtime/syntax/vim.vim

Co-authored-by: Sean Dewar <seandewar@users.noreply.github.com>
This commit is contained in:
dundargoc
2022-05-23 23:49:38 +02:00
committed by GitHub
parent 37ee800b51
commit a20892c4bc
6 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
runtime/colors/README.txt
View File

@@ -1,14 +1,18 @@
README.txt for color scheme files
These files are used for the ":colorscheme" command. They appear in the
These files are used for the `:colorscheme` command. They appear in the
"Edit/Color Scheme" menu in the GUI.
The colorschemes were updated for the Vim 9 release. If you don't like the
changes you can find the old ones here:
https://github.com/vim/colorschemes/tree/master/legacy_colors
Hints for writing a color scheme file:
There are two basic ways to define a color scheme:
1. Define a new Normal color and set the 'background' option accordingly.
1. Define a new Normal color and set the 'background' option accordingly. >
set background={light or dark}
highlight clear
@@ -16,7 +20,7 @@ There are two basic ways to define a color scheme:
...
2. Use the default Normal color and automatically adjust to the value of
'background'.
'background'. >
highlight clear Normal
set background&
@@ -29,17 +33,17 @@ There are two basic ways to define a color scheme:
...
endif
You can use ":highlight clear" to reset everything to the defaults, and then
You can use `:highlight clear` to reset everything to the defaults, and then
change the groups that you want differently. This will also work for groups
that are added in later versions of Vim.
Note that ":highlight clear" uses the value of 'background', thus set it
Note that `:highlight clear` uses the value of 'background', thus set it
before this command.
Some attributes (e.g., bold) might be set in the defaults that you want
removed in your color scheme. Use something like "gui=NONE" to remove the
attributes.
In case you want to set 'background' depending on the colorscheme selected,
this autocmd might be useful:
this autocmd might be useful: >
autocmd SourcePre */colors/blue_sky.vim set background=dark
@@ -49,7 +53,7 @@ In case you want to tweak a colorscheme after it was loaded, check out the
ColorScheme autocommand event.
To clean up just before loading another colorscheme, use the ColorSchemePre
autocommand event. For example:
autocommand event. For example: >
let g:term_ansi_colors = ...
augroup MyColorscheme
@@ -59,20 +63,20 @@ autocommand event. For example:
augroup END
To customize a colorscheme use another name, e.g. "~/.vim/colors/mine.vim",
and use ":runtime" to load the original colorscheme:
and use ":runtime" to load the original colorscheme: >
" load the "evening" colorscheme
runtime colors/evening.vim
" change the color of statements
hi Statement ctermfg=Blue guifg=Blue
To see which highlight group is used where, see ":help highlight-groups" and
":help group-name".
To see which highlight group is used where, see `:help highlight-groups` and
`:help group-name` .
You can use ":highlight" to find out the current colors. Exception: the
ctermfg and ctermbg values are numbers, which are only valid for the current
terminal. Use the color names instead for better portability. See
":help cterm-colors".
`:help cterm-colors` .
The default color settings can be found in the source file
"src/nvim/highlight_group.c". Search for "highlight_init".
@@ -86,7 +90,7 @@ please check the following items:
- Does it work in a color terminal as well as in the GUI? Is it consistent?
- Is "g:colors_name" set to a meaningful value? In case of doubt you can do
it this way:
it this way: >
let g:colors_name = expand('<sfile>:t:r')
@@ -121,7 +125,7 @@ please check the following items:
- Try to keep your color scheme simple by avoiding unnecessary logic and
refraining from adding options. The best color scheme is one that only
requires:
requires: >
colorscheme foobar
@@ -136,3 +140,6 @@ that:
- it was made with colortemplate,
and join us at vim/colorschemes: (https://github.com/vim/colorschemes).
vim: set ft=help :

16
runtime/doc/builtin.txt
View File

@@ -1026,7 +1026,7 @@ chansend({id}, {data}) *chansend()*
char2nr({string} [, {utf8}]) *char2nr()*
Return number value of the first char in {string}.
Return Number value of the first char in {string}.
Examples: >
char2nr(" ") returns 32
char2nr("ABC") returns 65
@@ -1894,8 +1894,8 @@ exists({expr}) The result is a Number, which is |TRUE| if {expr} is
< There must be no space between the symbol (&/$/*/#) and the
name.
There must be no extra characters after the name, although in
a few cases this is ignored. That may become more strict in
the future, thus don't count on it!
a few cases this is ignored. That may become stricter in the
future, thus don't count on it!
Working example: >
exists(":make")
< NOT working example: >
@@ -2680,7 +2680,7 @@ getchar([expr]) *getchar()*
Without [expr] and when [expr] is 0 a whole character or
special key is returned. If it is a single character, the
result is a number. Use nr2char() to convert it to a String.
result is a Number. Use |nr2char()| to convert it to a String.
Otherwise a String is returned with the encoded character.
For a special key it's a String with a sequence of bytes
starting with 0x80 (decimal: 128). This is the same value as
@@ -7612,9 +7612,11 @@ strftime({format} [, {time}]) *strftime()*
GetFormat()->strftime()
strgetchar({str}, {index}) *strgetchar()*
Get character {index} from {str}. This uses a character
index, not a byte index. Composing characters are considered
separate characters here.
Get a Number corresponding to the character at {index} in
{str}. This uses a zero-based character index, not a byte
index. Composing characters are considered separate
characters here. Use |nr2char()| to convert the Number to a
String.
Also see |strcharpart()| and |strchars()|.
Can also be used as a |method|: >

2
runtime/doc/syntax.txt
View File

@@ -1476,7 +1476,7 @@ modes Conditional, Number, Statement, Comment, PreProc, Type, and String,
following the language specifications in 'Symbolic Manipulation with FORM' by
J.A.M. Vermaseren, CAN, Netherlands, 1991.
If you want include your own changes to the default colors, you have to
If you want to include your own changes to the default colors, you have to
redefine the following syntax groups:
- formConditional

5
runtime/ftplugin/spec.vim
View File

@@ -3,6 +3,7 @@
" Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com
" Former Maintainer: Gustavo Niemeyer <niemeyer@conectiva.com> (until March 2014)
" Last Change: Mon Jun 01 21:15 MSK 2015 Igor Gnatenko
" Update by Zdenek Dohnal, 2022 May 17
if exists("b:did_ftplugin")
finish
@@ -41,8 +42,8 @@ else:
headers = spec.sourceHeader
version = headers["Version"]
release = headers["Release"]
vim.command("let ver = " + version)
vim.command("let rel = " + release)
vim.command("let ver = '" + version + "'")
vim.command("let rel = '" + release + "'")
PYEND
endif
endfunction

7
runtime/indent/fortran.vim
View File

@@ -1,13 +1,13 @@
" Vim indent file
" Language: Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
" Version: (v48) 2020 October 07
" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
" Version: (v49) 2022 May 14
" Maintainer: Ajit J. Thakkar <thakkar.ajit@gmail.com>; <http://www2.unb.ca/~ajit/>
" Usage: For instructions, do :help fortran-indent from Vim
" Credits:
" Version 0.1 was created in September 2000 by Ajit Thakkar.
" Since then, useful suggestions and contributions have been made, in order, by:
" Albert Oliver Serra, Takuya Fujiwara, Philipp Edelmann, Eisuke Kawashima,
" and Louis Cochen.
" Louis Cochen, and Doug Kearns.
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
@@ -17,6 +17,7 @@ let b:did_indent = 1
let s:cposet=&cpoptions
set cpoptions&vim
let b:undo_indent = "setl inde< indk<"
setlocal indentkeys+==~end,=~case,=~if,=~else,=~do,=~where,=~elsewhere,=~select
setlocal indentkeys+==~endif,=~enddo,=~endwhere,=~endselect,=~elseif

4
runtime/indent/postscr.vim
View File

@@ -1,10 +1,8 @@
" PostScript indent file
" Language: PostScript
" Maintainer: Mike Williams <mrw@netcomuk.co.uk> (Invalid email address)
" Doug Kearns <dougkearns@gmail.com>
" Maintainer: Mike Williams <mrw@eandem.co.uk>
" Last Change: 2022 Apr 06
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
finish