diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/eval.txt | 38 | ||||
| -rw-r--r-- | runtime/doc/usr_11.txt | 7 | ||||
| -rw-r--r-- | runtime/syntax/tutor.vim | 36 |
3 files changed, 61 insertions, 20 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 9600a0d356..b05c806ec3 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -2115,8 +2115,8 @@ gettabwinvar({tabnr}, {winnr}, {name} [, {def}]) gettagstack([{nr}]) Dict get the tag stack of window {nr} getwininfo([{winid}]) List list of windows getwinpos([{timeout}]) List X and Y coord in pixels of the Vim window -getwinposx() Number X coord in pixels of GUI Vim window -getwinposy() Number Y coord in pixels of GUI Vim window +getwinposx() Number X coord in pixels of Vim window +getwinposy() Number Y coord in pixels of Vim window getwinvar({nr}, {varname} [, {def}]) any variable {varname} in window {nr} glob({expr} [, {nosuf} [, {list} [, {alllinks}]]]) @@ -2324,6 +2324,8 @@ submatch({nr} [, {list}]) String or List specific match in ":s" or substitute() substitute({expr}, {pat}, {sub}, {flags}) String all {pat} in {expr} replaced with {sub} +swapinfo({fname}) Dict information about swap file {fname} +swapname({expr}) String swap file of buffer {expr} synID({lnum}, {col}, {trans}) Number syntax ID at {lnum} and {col} synIDattr({synID}, {what} [, {mode}]) String attribute {what} of syntax ID {synID} @@ -4581,6 +4583,13 @@ gettagstack([{nr}]) *gettagstack()* See |tagstack| for more information about the tag stack. +getwinpos([{timeout}]) *getwinpos()* + The result is a list with two numbers, the result of + getwinposx() and getwinposy() combined: + [x-pos, y-pos] + {timeout} can be used to specify how long to wait in msec for + a response from the terminal. When omitted 100 msec is used. + *getwinposx()* getwinposx() The result is a Number, which is the X coordinate in pixels of the left hand side of the GUI Vim window. The result will be @@ -7814,6 +7823,31 @@ substitute({expr}, {pat}, {sub}, {flags}) *substitute()* |submatch()| returns. Example: > :echo substitute(s, '\(\x\x\)', {m -> '0x' . m[1]}, 'g') +swapinfo({fname}) swapinfo() + The result is a dictionary, which holds information about the + swapfile {fname}. The available fields are: + version VIM version + user user name + host host name + fname original file name + pid PID of the VIM process that created the swap + file + mtime last modification time in seconds + inode Optional: INODE number of the file + dirty 1 if file was modified, 0 if not + In case of failure an "error" item is added with the reason: + Cannot open file: file not found or in accessible + Cannot read file: cannot read first block + Not a swap file: does not contain correct block ID + Magic number mismatch: Info in first block is invalid + +swapname({expr}) *swapname()* + The result is the swap file path of the buffer {expr}. + For the use of {expr}, see |bufname()| above. + If buffer {expr} is the current buffer, the result is equal to + |:swapname| (unless no swap file). + If buffer {expr} has no swap file, returns an empty string. + synID({lnum}, {col}, {trans}) *synID()* The result is a Number, which is the syntax ID at the position {lnum} and {col} in the current window. diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt index e5591ac1d1..42b564e962 100644 --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -205,6 +205,13 @@ something wrong. It may be one of these two situations. NEWER than swap file! ~ +NOTE that in the following situation Vim knows the swap file is not useful and +will automatically delete it: +- The file is a valid swap file (Magic number is correct). +- The flag that the file was modified is not set. +- The process is not running. + + UNREADABLE SWAP FILE Sometimes the line diff --git a/runtime/syntax/tutor.vim b/runtime/syntax/tutor.vim index cb101ee9a7..6305eef734 100644 --- a/runtime/syntax/tutor.vim +++ b/runtime/syntax/tutor.vim @@ -49,29 +49,29 @@ syn match tutorInlineType /{\(normal\|vim\)}/ contained conceal syn match tutorInlineOK /✓/ syn match tutorInlineX /✗/ -hi! tutorLink cterm=underline gui=underline ctermfg=lightblue guifg=#0088ff -hi! link tutorLinkBands Delimiter -hi! link tutorLinkAnchor Underlined -hi! link tutorInternalAnchor Underlined -hi! link tutorURL tutorLink -hi! link tutorEmail tutorLink +hi def tutorLink cterm=underline gui=underline ctermfg=lightblue guifg=#0088ff +hi def link tutorLinkBands Delimiter +hi def link tutorLinkAnchor Underlined +hi def link tutorInternalAnchor Underlined +hi def link tutorURL tutorLink +hi def link tutorEmail tutorLink -hi! link tutorSection Title -hi! link tutorSectionBullet Delimiter +hi def link tutorSection Title +hi def link tutorSectionBullet Delimiter -hi! link tutorTOC Directory +hi def link tutorTOC Directory -hi! tutorMarks cterm=bold gui=bold +hi def tutorMarks cterm=bold gui=bold -hi! tutorEmphasis gui=italic cterm=italic -hi! tutorBold gui=bold cterm=bold +hi def tutorEmphasis gui=italic cterm=italic +hi def tutorBold gui=bold cterm=bold -hi! link tutorExpect Special -hi! tutorOK ctermfg=green guifg=#00ff88 cterm=bold gui=bold -hi! tutorX ctermfg=red guifg=#ff2000 cterm=bold gui=bold -hi! link tutorInlineOK tutorOK -hi! link tutorInlineX tutorX +hi def link tutorExpect Special +hi def tutorOK ctermfg=green guifg=#00ff88 cterm=bold gui=bold +hi def tutorX ctermfg=red guifg=#ff2000 cterm=bold gui=bold +hi def link tutorInlineOK tutorOK +hi def link tutorInlineX tutorX -hi! link tutorShellPrompt Delimiter +hi def link tutorShellPrompt Delimiter let b:current_syntax = "tutor" |