From ee26b227e15abc263195d4c746d5dba9f0e6dec4 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 21 Feb 2023 23:50:29 +0800 Subject: vim-patch:partial:938ae280c79b (#22356) Update runtime files. https://github.com/vim/vim/commit/938ae280c79b8cdb0fca60336ec4c090ecd8bb5a Partially skip autocmd.txt: needs patch 8.2.5011. Partially skip builtin.txt: needs patch 9.0.0411. Partially skip eval.txt: needs patch 8.2.3783. Cherry-pick :map-meta-keys from patch 9.0.1276. Co-authored-by: Bram Moolenaar --- runtime/doc/pattern.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'runtime/doc/pattern.txt') diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 5357aaa3f1..625e1f95e1 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -97,6 +97,8 @@ g# Like "#", but don't put "\<" and "\>" around the word. *gd* gd Goto local Declaration. When the cursor is on a local variable, this command will jump to its declaration. + This was made to work for C code, in other languages + it may not work well. First Vim searches for the start of the current function, just like "[[". If it is not found the search stops in line 1. If it is found, Vim goes back @@ -1129,21 +1131,21 @@ x A single character, with no special meaning, matches itself are supported: Name Func Contents ~ *[:alnum:]* [:alnum:] isalnum ASCII letters and digits -*[:alpha:]* [:alpha:] isalpha ASCII letters -*[:blank:]* [:blank:] space and tab -*[:cntrl:]* [:cntrl:] iscntrl ASCII control characters -*[:digit:]* [:digit:] decimal digits '0' to '9' +*[:alpha:]* [:alpha:] isalpha ASCII letters +*[:blank:]* [:blank:] space and tab +*[:cntrl:]* [:cntrl:] iscntrl ASCII control characters +*[:digit:]* [:digit:] decimal digits '0' to '9' *[:graph:]* [:graph:] isgraph ASCII printable characters excluding space *[:lower:]* [:lower:] (1) lowercase letters (all letters when 'ignorecase' is used) -*[:print:]* [:print:] (2) printable characters including space +*[:print:]* [:print:] (2) printable characters including space *[:punct:]* [:punct:] ispunct ASCII punctuation characters -*[:space:]* [:space:] whitespace characters: space, tab, CR, +*[:space:]* [:space:] whitespace characters: space, tab, CR, NL, vertical tab, form feed *[:upper:]* [:upper:] (3) uppercase letters (all letters when 'ignorecase' is used) -*[:xdigit:]* [:xdigit:] hexadecimal digits: 0-9, a-f, A-F +*[:xdigit:]* [:xdigit:] hexadecimal digits: 0-9, a-f, A-F *[:return:]* [:return:] the character *[:tab:]* [:tab:] the character *[:escape:]* [:escape:] the character -- cgit From 72a6643b1380cdf6f1153d70eeaffb90bdca30d6 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 19 Jun 2023 08:40:33 -0700 Subject: docs #24061 - nvim requires rpc responses in reverse order. https://github.com/neovim/neovim/issues/19932 - NVIM_APPNAME: UIs normally should NOT set this. ref #23520 fix #24050 fix #23660 fix #23353 fix #23337 fix #22213 fix #19161 fix #18088 fix #20693 --- runtime/doc/pattern.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'runtime/doc/pattern.txt') diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 625e1f95e1..8437496011 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1298,7 +1298,6 @@ will probably never match. When "\Z" appears anywhere in the pattern, all composing characters are ignored. Thus only the base characters need to match, the composing characters may be different and the number of composing characters may differ. -Only relevant when 'encoding' is "utf-8". Exception: If the pattern starts with one or more composing characters, these must match. */\%C* -- cgit From d931b829e92665fd7371b1bb49d22ce25b50a89a Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Wed, 21 Jun 2023 15:40:40 +0200 Subject: fix(docs): vimdoc syntax errors Since https://github.com/neovim/tree-sitter-vimdoc/pull/97 the many cases of *.foo cause parser errors. But even before that, these were erroneously highlighted as (argument), so fixing them is good. --- runtime/doc/pattern.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'runtime/doc/pattern.txt') diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 8437496011..7ea3b7df76 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -432,8 +432,6 @@ after: \v \m \M \V matches ~ \\ \\ \\ \\ literal backslash \{ { { { literal curly brace -{only Vim supports \m, \M, \v and \V} - If you want to you can make a pattern immune to the 'magic' option being set or not by putting "\m" or "\M" at the start of the pattern. @@ -455,7 +453,7 @@ More explanation and examples below, follow the links. *E64* *E871* \{n} \{n} n exactly \{n,} \{n,} at least n as many as possible \{,m} \{,m} 0 to m as many as possible - \{} \{} 0 or more as many as possible (same as *) + \{} \{} 0 or more as many as possible (same as "*") |/\{-| \{-n,m} \{-n,m} n to m as few as possible \{-n} \{-n} n exactly @@ -633,7 +631,7 @@ overview. \{n} Matches n of the preceding atom \{n,} Matches at least n of the preceding atom, as many as possible \{,m} Matches 0 to m of the preceding atom, as many as possible -\{} Matches 0 or more of the preceding atom, as many as possible (like *) +\{} Matches 0 or more of the preceding atom, as many as possible (like "*") */\{-* \{-n,m} matches n to m of the preceding atom, as few as possible \{-n} matches n of the preceding atom @@ -1256,7 +1254,6 @@ letters only. When "\c" appears anywhere in the pattern, the whole pattern is handled like 'ignorecase' is on. The actual value of 'ignorecase' and 'smartcase' is ignored. "\C" does the opposite: Force matching case for the whole pattern. -{only Vim supports \c and \C} Note that 'ignorecase', "\c" and "\C" are not used for the character classes. Examples: @@ -1338,11 +1335,10 @@ difference between them is mostly just notation; here's a summary of where they differ: Capability in Vimspeak in Perlspeak ~ ----------------------------------------------------------------- force case insensitivity \c (?i) force case sensitivity \C (?-i) backref-less grouping \%(atom\) (?:atom) -conservative quantifiers \{-n,m} *?, +?, ??, {}? +conservative quantifiers \{-n,m} `*?,` +?, ??, {}? 0-width match atom\@= (?=atom) 0-width non-match atom\@! (?!atom) 0-width preceding match atom\@<= (?<=atom) -- cgit From 0a90e4b05ad3263bf656e24f616b6dadf6ba92e4 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 8 Jul 2023 15:58:50 +0200 Subject: fix(docs): match DocSearch style with site theme ref https://github.com/neovim/neovim.github.io/commit/2b4f9e47809c16743f7d31d0dc1f1e3c2f313a56 --- runtime/doc/pattern.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/doc/pattern.txt') diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 7ea3b7df76..d74757de4f 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -72,7 +72,7 @@ N Repeat the latest "/" or "?" [count] times in command "/\". |exclusive| 'ignorecase' is used, 'smartcase' is not. *v_star-default* - In Visual mode, search forward for the current selection. +{Visual}* In Visual mode, search forward for the current selection. |default-mappings| *#* @@ -81,7 +81,7 @@ N Repeat the latest "/" or "?" [count] times in backspace, try using "stty erase " before starting Vim ( is CTRL-H or a real backspace). *v_#-default* - In Visual mode, search backward for the current selection. +{Visual}# In Visual mode, search backward for the current selection. |default-mappings| *gstar* -- cgit From b003e7feca98ca5e588fdfa1b6fb5c293a68b6d1 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 3 Oct 2023 06:20:44 +0800 Subject: vim-patch:ba77bbb5c775 runtime(doc): fix typos. * Fix typo in document (Related: vim/vim#12516) * Fix E1363 duplication * Fix one more typo. https://github.com/vim/vim/commit/ba77bbb5c775663a8b55871f753d7b1b570bb9ba Co-authored-by: h_east --- runtime/doc/pattern.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/doc/pattern.txt') diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index d74757de4f..09119b0918 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1065,7 +1065,7 @@ match ASCII characters, as indicated by the range. \(\) A pattern enclosed by escaped parentheses. */\(* */\(\)* */\)* E.g., "\(^a\)" matches 'a' at the start of a line. - There can only be ten of these. You can use "\%(" to add more, but + There can only be nine of these. You can use "\%(" to add more, but not counting it as a sub-expression. *E51* *E54* *E55* *E872* *E873* -- cgit From fc02908c97fa850964a1f15a32eb7a872449b7e7 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 21 Oct 2023 18:04:08 +0800 Subject: vim-patch:d3e277f279ed (#25734) matchparen: do not use hard-coded match id (vim/vim#13393) * matchparen: do not use hard-coded match id Instead of using the hard-coded match id 3, which may also be used by other plugins, let the matchparen plugin use whatever ids are automatically returned when calling matchaddpos(). For backwards-compatibility, keep the `:3match` call, which will still use the hard-coded id 3 (as mentioned in :h :3match). closes: vim/vim#13381 https://github.com/vim/vim/commit/d3e277f279ed628809eb6857ea3ebcfca566ca2a Co-authored-by: Christian Brabandt --- runtime/doc/pattern.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'runtime/doc/pattern.txt') diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 09119b0918..17136ee650 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1442,10 +1442,11 @@ Finally, these constructs are unique to Perl: Just like |:match| above, but set a separate match. Thus there can be three matches active at the same time. The match with the lowest number has priority if several match at the - same position. - The ":3match" command is used by the |matchparen| plugin. You - are suggested to use ":match" for manual matching and - ":2match" for another plugin. + same position. It uses the match id 3. + The ":3match" command is used by (older Vims) |matchparen| + plugin. You are suggested to use ":match" for manual matching + and ":2match" for another plugin or even better make use of + the more flexible |matchadd()| (and similar) functions instead. ============================================================================== 11. Fuzzy matching *fuzzy-matching* -- cgit