diff options
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/eval.txt | 17 | ||||
-rw-r--r-- | runtime/doc/options.txt | 22 | ||||
-rw-r--r-- | runtime/doc/usr_41.txt | 2 |
3 files changed, 35 insertions, 6 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index d29451f5c3..b3d5f4d7e9 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -2596,9 +2596,11 @@ rpcrequest({channel}, {method}[, {args}...]) Sends an |RPC| request to {channel} screenattr({row}, {col}) Number attribute at screen position screenchar({row}, {col}) Number character at screen position +screenchars({row}, {col}) List List of characters at screen position screencol() Number current cursor column screenpos({winid}, {lnum}, {col}) Dict screen row and col of a text character screenrow() Number current cursor row +screenstring({row}, {col}) String characters at screen position search({pattern} [, {flags} [, {stopline} [, {timeout}]]]) Number search for {pattern} searchcount([{options}]) Dict Get or update the last search count @@ -7669,6 +7671,13 @@ screenchar({row}, {col}) *screenchar()* This is mainly to be used for testing. Returns -1 when row or col is out of range. +screenchars({row}, {col}) *screenchars()* + The result is a List of Numbers. The first number is the same + as what |screenchar()| returns. Further numbers are + composing characters on top of the base character. + This is mainly to be used for testing. + Returns an empty List when row or col is out of range. + screencol() *screencol()* The result is a Number, which is the current screen column of the cursor. The leftmost column has number 1. @@ -7712,6 +7721,14 @@ screenrow() *screenrow()* Note: Same restrictions as with |screencol()|. +screenstring({row}, {col}) *screenstring()* + The result is a String that contains the base character and + any composing characters at position [row, col] on the screen. + This is like |screenchars()| but returning a String with the + characters. + This is mainly to be used for testing. + Returns an empty String when row or col is out of range. + search({pattern} [, {flags} [, {stopline} [, {timeout}]]]) *search()* Search for regexp pattern {pattern}. The search starts at the cursor position (you can use |cursor()| to set it). diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index bc4cdcbd80..853d774232 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3751,16 +3751,25 @@ A jump table for the options with a short description can be found at |Q_op|. *lcs-space* space:c Character to show for a space. When omitted, spaces are left blank. + *lcs-multispace* + multispace:c... + One or more characters to use cyclically to show for + multiple consecutive spaces. Overrides the "space" + setting, except for single spaces. When omitted, the + "space" setting is used. For example, + `:set listchars=multispace:---+` shows ten consecutive + spaces as: + ---+---+-- *lcs-lead* lead:c Character to show for leading spaces. When omitted, - leading spaces are blank. Overrides the "space" - setting for leading spaces. You can combine it with - "tab:", for example: > + leading spaces are blank. Overrides the "space" and + "multispace" settings for leading spaces. You can + combine it with "tab:", for example: > :set listchars+=tab:>-,lead:. < *lcs-trail* trail:c Character to show for trailing spaces. When omitted, - trailing spaces are blank. Overrides the "space" - setting for trailing spaces. + trailing spaces are blank. Overrides the "space" and + "multispace" settings for trailing spaces. *lcs-extends* extends:c Character to show in the last column, when 'wrap' is off and the line continues beyond the right of the @@ -3785,7 +3794,8 @@ A jump table for the options with a short description can be found at |Q_op|. :set lcs=tab:>-,eol:<,nbsp:% :set lcs=extends:>,precedes:< < |hl-NonText| highlighting will be used for "eol", "extends" and - "precedes". |hl-Whitespace| for "nbsp", "space", "tab" and "trail". + "precedes". |hl-Whitespace| for "nbsp", "space", "tab", "multispace", + "lead" and "trail". *'lpl'* *'nolpl'* *'loadplugins'* *'noloadplugins'* 'loadplugins' 'lpl' boolean (default on) diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index c9321e8736..5fddadcf01 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -744,6 +744,8 @@ Cursor and mark position: *cursor-functions* *mark-functions* diff_filler() get the number of filler lines above a line screenattr() get attribute at a screen line/row screenchar() get character code at a screen line/row + screenchars() get character codes at a screen line/row + screenstring() get string of characters at a screen line/row Working with text in the current buffer: *text-functions* getline() get a line or list of lines from the buffer |