aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00
Code

Update runtime files.

Browse Source
This commit is contained in:
Bram Moolenaar 2018-08-28 22:58:02 +02:00
parent 627cb6a6b3
commit fc65cabb15
33 changed files with 3983 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3382
runtime/autoload/haskellcomplete.vim Normal file
View File

File diff suppressed because it is too large Load Diff

4
runtime/autoload/tar.vim
View File

@ -155,7 +155,7 @@ fun! tar#Browse(tarfile)
let curlast= line("$") let curlast= line("$")
if tarfile =~# '\.\(gz\|tgz\)$' if tarfile =~# '\.\(gz\|tgz\)$'
" call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ") " call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - " exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
elseif tarfile =~# '\.lrp' elseif tarfile =~# '\.lrp'
" call Decho("2: exe silent r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - ") " call Decho("2: exe silent r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - " exe "sil! r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - "
@ -292,7 +292,7 @@ fun! tar#Read(fname,mode)
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
elseif tarfile =~# '\.\(gz\|tgz\)$' elseif tarfile =~# '\.\(gz\|tgz\)$'
" call Decho("5: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd.' -'.g:tar_readoptions.' - '.tar_secure.shellescape(fname,1)) " call Decho("5: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd.' -'.g:tar_readoptions.' - '.tar_secure.shellescape(fname,1))
exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
elseif tarfile =~# '\.lrp$' elseif tarfile =~# '\.lrp$'
" call Decho("6: exe silent r! cat ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp) " call Decho("6: exe silent r! cat ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
exe "sil! r! cat -- ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp exe "sil! r! cat -- ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp

8
runtime/doc/eval.txt
View File

@ -954,6 +954,13 @@ These three can be repeated and mixed. Examples:
expr8 *expr8* expr8 *expr8*
----- -----
This expression is either |expr9| or a sequence of the alternatives below,
in any order. E.g., these are all possible:
expr9[expr1].name
expr9.name[expr1]
expr9(expr1, ...)[expr1].name
expr8[expr1] item of String or |List| *expr-[]* *E111* expr8[expr1] item of String or |List| *expr-[]* *E111*
*E909* *subscript* *E909* *subscript*
If expr8 is a Number or String this results in a String that contains the If expr8 is a Number or String this results in a String that contains the
@ -8014,6 +8021,7 @@ swapinfo({fname}) swapinfo()
mtime last modification time in seconds mtime last modification time in seconds
inode Optional: INODE number of the file inode Optional: INODE number of the file
dirty 1 if file was modified, 0 if not dirty 1 if file was modified, 0 if not
Note that "user" and "host" are truncated to at most 39 bytes.
In case of failure an "error" item is added with the reason: In case of failure an "error" item is added with the reason:
Cannot open file: file not found or in accessible Cannot open file: file not found or in accessible
Cannot read file: cannot read first block Cannot read file: cannot read first block

22
runtime/doc/filetype.txt
View File

@ -638,11 +638,31 @@ By default the following options are set, in accordance with PEP8: >
setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8 setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8
To disable this behaviour, set the following variable in your vimrc: > To disable this behavior, set the following variable in your vimrc: >
let g:python_recommended_style = 0 let g:python_recommended_style = 0
R MARKDOWN *ft-rmd-plugin*
By default ftplugin/html.vim is not sourced. If you want it sourced, add to
your |vimrc|: >
let rmd_include_html = 1
The 'formatexpr' option is set dynamically with different values for R code
and for Markdown code. If you prefer that 'formatexpr' is not set, add to your
|vimrc|: >
let rmd_dynamic_comments = 0
R RESTRUCTURED TEXT *ft-rrst-plugin*
The 'formatexpr' option is set dynamically with different values for R code
and for ReStructured text. If you prefer that 'formatexpr' is not set, add to
your |vimrc|: >
let rrst_dynamic_comments = 0
RPM SPEC *ft-spec-plugin* RPM SPEC *ft-spec-plugin*
Since the text for this plugin is rather long it has been put in a separate Since the text for this plugin is rather long it has been put in a separate

12
runtime/doc/if_pyth.txt
View File

@ -168,11 +168,15 @@ vim.eval(str) *python-eval*
- a dictionary if the Vim expression evaluates to a Vim dictionary - a dictionary if the Vim expression evaluates to a Vim dictionary
Dictionaries and lists are recursively expanded. Dictionaries and lists are recursively expanded.
Examples: > Examples: >
:" value of the 'textwidth' option
:py text_width = vim.eval("&tw") :py text_width = vim.eval("&tw")
:py str = vim.eval("12+12") # NB result is a string! Use :
# string.atoi() to convert to :" contents of the 'a' register
# a number. :py a_reg = vim.eval("@a")
:
:" Result is a string! Use string.atoi() to convert to a number.
:py str = vim.eval("12+12")
:
:py tagList = vim.eval('taglist("eval_expr")') :py tagList = vim.eval('taglist("eval_expr")')
< The latter will return a python list of python dicts, for instance: < The latter will return a python list of python dicts, for instance:
[{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name': ~ [{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name': ~

5
runtime/doc/indent.txt
View File

@ -978,6 +978,11 @@ Below is an example of indentation with and without this option enabled:
paste(x) paste(x) paste(x) paste(x)
} } } }
< <
The code will be indented after lines that match the pattern
`'\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\)\s*$'`. If you want indentation after
lines that match a different pattern, you should set the appropriate value of
`r_indent_op_pattern` in your |vimrc|.
SHELL *ft-sh-indent* SHELL *ft-sh-indent*

12
runtime/doc/insert.txt
View File

@ -1051,13 +1051,13 @@ The function must return the column where the completion starts. It must be a
number between zero and the cursor column "col('.')". This involves looking number between zero and the cursor column "col('.')". This involves looking
at the characters just before the cursor and including those characters that at the characters just before the cursor and including those characters that
could be part of the completed item. The text between this column and the could be part of the completed item. The text between this column and the
cursor column will be replaced with the matches. cursor column will be replaced with the matches. If the returned value is
larger than the cursor column, the cursor column is used.
Special return values: Negative return values:
-1 If no completion can be done, the completion will be cancelled with an -2 To cancel silently and stay in completion mode.
error message. -3 To cancel silently and leave completion mode.
-2 To cancel silently and stay in completion mode. Another negative value: completion starts at the cursor column
-3 To cancel silently and leave completion mode.
On the second invocation the arguments are: On the second invocation the arguments are:
a:findstart 0 a:findstart 0

14
runtime/doc/options.txt
View File

@ -4480,8 +4480,18 @@ A jump table for the options with a short description can be found at |Q_op|.
so far, matches. The matched string is highlighted. If the pattern so far, matches. The matched string is highlighted. If the pattern
is invalid or not found, nothing is shown. The screen will be updated is invalid or not found, nothing is shown. The screen will be updated
often, this is only useful on fast terminals. often, this is only useful on fast terminals.
Also applies to the `:s`, `:g` and `:v` commands. Also applies to the pattern in commands: >
Note that the match will be shown, but the cursor will return to its :global
:lvimgrep
:lvimgrepadd
:smagic
:snomagic
:sort
:substitute
:vglobal
:vimgrep
:vimgrepadd
< Note that the match will be shown, but the cursor will return to its
original position when no match is found and when pressing <Esc>. You original position when no match is found and when pressing <Esc>. You
still need to finish the search command with <Enter> to move the still need to finish the search command with <Enter> to move the
cursor to the match. cursor to the match.

4
runtime/doc/quickfix.txt
View File

@ -1557,8 +1557,8 @@ reduce the number of entries. Load the plugin with: >
packadd cfilter packadd cfilter
Then you can use these command: > Then you can use these command: >
:Cfilter[!] {pat} :Cfilter[!] /{pat}/
:Lfilter[!] {pat} :Lfilter[!] /{pat}/
:Cfilter creates a new quickfix list from entries matching {pat} in the :Cfilter creates a new quickfix list from entries matching {pat} in the
current quickfix list. Both the file name and the text of the entries are current quickfix list. Both the file name and the text of the entries are

44
runtime/doc/syntax.txt
View File

@ -1265,7 +1265,7 @@ doxygen_javadoc_autobrief 1 Set to 0 to disable javadoc autobrief
doxygen_end_punctuation '[.]' Set to regexp match for the ending doxygen_end_punctuation '[.]' Set to regexp match for the ending
punctuation of brief punctuation of brief
There are also some hilight groups worth mentioning as they can be useful in There are also some highlight groups worth mentioning as they can be useful in
configuration. configuration.
Highlight Effect ~ Highlight Effect ~
@ -2641,6 +2641,48 @@ Any combination of these three variables is legal, but might highlight more
commands than are actually available to you by the game. commands than are actually available to you by the game.
R *r.vim* *ft-r-syntax*
The parsing of R code for syntax highlight starts 40 lines backwards, but you
can set a different value in your |vimrc|. Example: >
let r_syntax_minlines = 60
You can also turn off syntax highlighting of ROxygen: >
let r_syntax_hl_roxygen = 0
enable folding of code delimited by parentheses, square brackets and curly
braces: >
let r_syntax_folding = 1
and highlight as functions all keywords followed by an opening parenthesis: >
let r_syntax_fun_pattern = 1
R MARKDOWN *rmd.vim* *ft-rmd-syntax*
To disable syntax highlight of YAML header, add to your |vimrc|: >
let rmd_syn_hl_yaml = 0
To disable syntax highlighting of citation keys: >
let rmd_syn_hl_citations = 0
To highlight R code in knitr chunk headers: >
let rmd_syn_hl_chunk = 1
By default, chunks of R code will be highlighted following the rules of R
language. If you want proper syntax highlighting of chunks of other languages,
you should add them to either `markdown_fenced_languages` or
`rmd_fenced_languages`. For example to properly highlight both R and Python,
you may add this to your |vimrc|: >
let rmd_fenced_languages = ['r', 'python']
R RESTRUCTURED TEXT *rrst.vim* *ft-rrst-syntax*
To highlight R code in knitr chunk headers, add to your |vimrc|: >
let rrst_syn_hl_chunk = 1
READLINE *readline.vim* *ft-readline-syntax* READLINE *readline.vim* *ft-readline-syntax*
The readline library is primarily used by the BASH shell, which adds quite a The readline library is primarily used by the BASH shell, which adds quite a

2
runtime/doc/tabpage.txt
View File

@ -243,7 +243,7 @@ REORDERING TAB PAGES:
Move the current tab page to after tab page N. Use zero to Move the current tab page to after tab page N. Use zero to
make the current tab page the first one. N is counted before make the current tab page the first one. N is counted before
the move, thus if the second tab is the current one, the move, thus if the second tab is the current one,
`:tabmove 1`` and `:tabmove 2` have no effect. `:tabmove 1` and `:tabmove 2` have no effect.
Without N the tab page is made the last one. > Without N the tab page is made the last one. >
:.tabmove " do nothing :.tabmove " do nothing
:-tabmove " move the tab page to the left :-tabmove " move the tab page to the left

8
runtime/doc/tags
View File

@ -6270,8 +6270,13 @@ ft-python-plugin filetype.txt /*ft-python-plugin*
ft-python-syntax syntax.txt /*ft-python-syntax* ft-python-syntax syntax.txt /*ft-python-syntax*
ft-quake-syntax syntax.txt /*ft-quake-syntax* ft-quake-syntax syntax.txt /*ft-quake-syntax*
ft-r-indent indent.txt /*ft-r-indent* ft-r-indent indent.txt /*ft-r-indent*
ft-r-syntax syntax.txt /*ft-r-syntax*
ft-readline-syntax syntax.txt /*ft-readline-syntax* ft-readline-syntax syntax.txt /*ft-readline-syntax*
ft-rexx-syntax syntax.txt /*ft-rexx-syntax* ft-rexx-syntax syntax.txt /*ft-rexx-syntax*
ft-rmd-plugin filetype.txt /*ft-rmd-plugin*
ft-rmd-syntax syntax.txt /*ft-rmd-syntax*
ft-rrst-plugin filetype.txt /*ft-rrst-plugin*
ft-rrst-syntax syntax.txt /*ft-rrst-syntax*
ft-rst-syntax syntax.txt /*ft-rst-syntax* ft-rst-syntax syntax.txt /*ft-rst-syntax*
ft-ruby-omni insert.txt /*ft-ruby-omni* ft-ruby-omni insert.txt /*ft-ruby-omni*
ft-ruby-syntax syntax.txt /*ft-ruby-syntax* ft-ruby-syntax syntax.txt /*ft-ruby-syntax*
@ -8200,6 +8205,7 @@ quotes.txt quotes.txt /*quotes.txt*
quotestar gui.txt /*quotestar* quotestar gui.txt /*quotestar*
quote~ change.txt /*quote~* quote~ change.txt /*quote~*
r change.txt /*r* r change.txt /*r*
r.vim syntax.txt /*r.vim*
range() eval.txt /*range()* range() eval.txt /*range()*
raw-terminal-mode term.txt /*raw-terminal-mode* raw-terminal-mode term.txt /*raw-terminal-mode*
rcp pi_netrw.txt /*rcp* rcp pi_netrw.txt /*rcp*
@ -8264,8 +8270,10 @@ right-justify change.txt /*right-justify*
rileft rileft.txt /*rileft* rileft rileft.txt /*rileft*
rileft.txt rileft.txt /*rileft.txt* rileft.txt rileft.txt /*rileft.txt*
riscos os_risc.txt /*riscos* riscos os_risc.txt /*riscos*
rmd.vim syntax.txt /*rmd.vim*
rot13 change.txt /*rot13* rot13 change.txt /*rot13*
round() eval.txt /*round()* round() eval.txt /*round()*
rrst.vim syntax.txt /*rrst.vim*
rst.vim syntax.txt /*rst.vim* rst.vim syntax.txt /*rst.vim*
rsync pi_netrw.txt /*rsync* rsync pi_netrw.txt /*rsync*
ruby if_ruby.txt /*ruby* ruby if_ruby.txt /*ruby*

4
runtime/doc/terminal.txt
View File

@ -228,6 +228,10 @@ Syntax ~
If you want to use more options use the |term_start()| If you want to use more options use the |term_start()|
function. function.
If you want to split the window vertically, use: >
:vertical terminal
< Or short: >
:vert ter
When the buffer associated with the terminal is forcibly unloaded or wiped out When the buffer associated with the terminal is forcibly unloaded or wiped out
the job is killed, similar to calling `job_stop(job, "kill")` . the job is killed, similar to calling `job_stop(job, "kill")` .

114
runtime/doc/todo.txt
View File

@ -38,6 +38,15 @@ browser use: https://github.com/vim/vim/issues/1234
*known-bugs* *known-bugs*
-------------------- Known bugs and current work ----------------------- -------------------- Known bugs and current work -----------------------
'incsearch' with :s: (#3321)
- :/foo/s//<Esc> changes last search pattern. Also E486.
- :s/foo using CTRL-G moves to another line, should not happen, or use the
correct line (it uses the last but one line) (Lifepillar, Aug 18, #3345)
- Also support range: :/foo/,/bar/delete
- :%s/foo should take the first match below the cursor line, unless there
isn't one?
Then :%s?foo should take the first match above the cursor line.
Prompt buffer: Prompt buffer:
- Add a command line history. - Add a command line history.
- delay next prompt until plugin gives OK? - delay next prompt until plugin gives OK?
@ -50,11 +59,16 @@ Terminal debugger:
initializing mzscheme avoid the problem, thus it's not some #ifdef. initializing mzscheme avoid the problem, thus it's not some #ifdef.
Terminal emulator window: Terminal emulator window:
- GUI: When using ":set go+=!" a system() call causes the hit-enter prompt.
(#3327)
- When the job in the terminal doesn't use mouse events, let the scroll wheel - When the job in the terminal doesn't use mouse events, let the scroll wheel
scroll the scrollback, like a terminal does at the shell prompt. #2490 scroll the scrollback, like a terminal does at the shell prompt. #2490
And use modeless selection. #2962 And use modeless selection. #2962
- Allow for specifying the directory, with ++cwd={dir}.
- With a vertical split only one window is updated. (Linwei, 2018 Jun 2, - With a vertical split only one window is updated. (Linwei, 2018 Jun 2,
#2977) #2977)
- Add a way to make ":term cmd" run "cmd" in a shell, instead of executing it
directly. Perhaps ":term ++shell cmd". (#3340)
- When pasting should call vterm_keyboard_start_paste(), e.g. when using - When pasting should call vterm_keyboard_start_paste(), e.g. when using
K_MIDDLEMOUSE, calling insert_reg(). K_MIDDLEMOUSE, calling insert_reg().
- Users expect parsing the :term argument like a shell does, also support - Users expect parsing the :term argument like a shell does, also support
@ -74,35 +88,12 @@ Terminal emulator window:
- When 'encoding' is not utf-8, or the job is using another encoding, setup - When 'encoding' is not utf-8, or the job is using another encoding, setup
conversions. conversions.
Patch to support ":tag <tagkind> <tagname". (emmrk, 2018 May 7, #2871) Not possible to have a comment in between line continuation. Use |\":
let array = [
Patch to parse ":line" in tags file and use it for search. (Daniel Hahler, \ item,
#2546) Fixes #1057. Missing a test. |\" comment
\ item,
Problem with quickfix giving E42 when filtering the error list. \ ]
(Nobuhiro Takasaki, 2018 Aug 1, #3270)
Patch with test from Yegappan, Aug 2.
Patch to add variable name after "scope add". (Eddie Lebow, 2018 Feb 7, #2620)
Maybe not needed?
Patch in issue 3268, fix suggestion window appearing on wrong screen.
Also from Ken Takata, 2018 Aug 2.
Patch for Lua support. (Kazunobu Kuriyama, 2018 May 26)
Patch to use NGETTEXT() in many more places. (Sergey Alyoshin, 2018 May 25)
Updated patch May 27.
Patch to add winlayout() function. (Yegappan Lakshmanan, 2018 Jan 4)
Patch to fix profiling condition lines. (Ozaki Kiichi,, 2017 Dec 26, #2499)
Issue #686: apply 'F' in 'shortmess' to more messages. Also #3221.
Patch on #3221 from Christian. Does it work now?
Patch to include a cfilter plugin to filter quickfix/location lists.
(Yegappan Lakshmanan, 2018 May 12)
Does not build with MinGW out of the box: Does not build with MinGW out of the box:
- _stat64 is not defined, need to use "struct stat" in vim.h - _stat64 is not defined, need to use "struct stat" in vim.h
@ -111,9 +102,6 @@ Does not build with MinGW out of the box:
Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
13, #2910) Can't reproduce? 13, #2910) Can't reproduce?
On Win32 when not in the console and t_Co >= 256, allow using 'tgc'.
(Nobuhiro Takasaki, #2833) Also check t_Co.
Errors found with random data: Errors found with random data:
heap-buffer-overflow in alist_add (#2472) heap-buffer-overflow in alist_add (#2472)
@ -121,7 +109,15 @@ Improve fallback for menu translations, to avoid having to create lots of
files that source the actual file. E.g. menu_da_de -> menu_da files that source the actual file. E.g. menu_da_de -> menu_da
Include part of #3242? Include part of #3242?
Inlcude Chinese-Taiwan translations. (bystar, #3261) Using ":file" in quickfix window during an autocommand doesn't work.
(Jason Franklin, 2018 May 23) Allow for using it when there is no argument.
Patch should now work. (Jason Franklin, 2018 Aug 12)
Include Chinese-Taiwan translations. (bystar, #3261)
Screendump test fails even though characters are the same.
Some attribute difference that isn't included in the screenshot?
(Elimar Riesebieter, 2018 Aug 21)
Completion mixes results from the current buffer with tags and other files. Completion mixes results from the current buffer with tags and other files.
Happens when typing CTRL-N while still search for results. E.g., type "b_" in Happens when typing CTRL-N while still search for results. E.g., type "b_" in
@ -129,8 +125,10 @@ terminal.c and then CTRL-N twice.
Should do current file first and not split it up when more results are found. Should do current file first and not split it up when more results are found.
(Also #1890) (Also #1890)
Using mouse for inputlist() doesn't work after patch 8.0.1756. (Dominique Patch to support VTP better. (Nobuhiro Takasaki, 2018 Aug 19, #3347)
Pelle, 2018 Jul 22, #3239) Also see 8.0.0722. Check both console and GUI.
Patch with improvement for ccomplete: #3350
Try it out. Perhaps write a test?
More warnings from static analysis: More warnings from static analysis:
https://lgtm.com/projects/g/vim/vim/alerts/?mode=list https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
@ -138,12 +136,12 @@ https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17) Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17)
Related to bracketed paste. I cannot reproduce it. Related to bracketed paste. I cannot reproduce it.
Using ":file" in quickfix window during an autocommand doesn't work.
(Jason Franklin, 2018 May 23) Allow for using it when there is no argument.
Patch in pull request #2967: Allow white space in sign text. (Ben Jackson) Patch in pull request #2967: Allow white space in sign text. (Ben Jackson)
Test fails in AppVeyor. Test fails in AppVeyor.
Patch to add script line number to script ID. (ichizok, Ozaki Kiichi, 2018 Aug
24, #3362)
Removing flags from 'cpoptions' breaks the Winbar buttons in termdebug. Removing flags from 'cpoptions' breaks the Winbar buttons in termdebug.
(Dominique Pelle, 2018 Jul 16) (Dominique Pelle, 2018 Jul 16)
@ -186,6 +184,10 @@ Delete the src/main.aap file?
matchaddpos() gets slow with many matches. Proposal by Rick Howe, 2018 Jul matchaddpos() gets slow with many matches. Proposal by Rick Howe, 2018 Jul
19. 19.
Patch to support ":tag <tagkind> <tagname>". (emmrk, 2018 May 7, #2871)
Use something like ":tag {kind}/{tagname}".
Not ready to include.
home_replace() uses $HOME instead of "homedir". (Cesar Martins, 2018 Aug 9) home_replace() uses $HOME instead of "homedir". (Cesar Martins, 2018 Aug 9)
Adjust windows installer explanation of behavior. (scootergrisen, #3310) Adjust windows installer explanation of behavior. (scootergrisen, #3310)
@ -193,6 +195,17 @@ Adjust windows installer explanation of behavior. (scootergrisen, #3310)
Set g:actual_curbuf when evaluating 'statusline', not just with an expression. Set g:actual_curbuf when evaluating 'statusline', not just with an expression.
(Daniel Hahler, 2018 Aug 8, #3299) (Daniel Hahler, 2018 Aug 8, #3299)
Difference between two regexp engines: #3373
When the last line wraps, selecting with the mouse below that line only
includes the first screen line. (2018 Aug 23, #3368)
Refactored HTML indent file. (Michael Lee, #1821)
Patch to add getregpoint() and setreg() with an option to set "".
(Andy Massimino, 2018 Aug 24, #3370)
Better name?
Script generated by :mksession does not work well if there are windows with Script generated by :mksession does not work well if there are windows with
modified buffers modified buffers
change "silent only" into "silent only!" change "silent only" into "silent only!"
@ -209,6 +222,12 @@ Compiler warnings (geeknik, 2017 Oct 26):
Win32 console: <F11> and <F12> typed in Insert mode don't result in normal Win32 console: <F11> and <F12> typed in Insert mode don't result in normal
characters. (#3246) characters. (#3246)
Height of quickfix window is not retained with vertical splits. (Lifepillar,
2018 Aug 24, #2998)
Window size is wrong when using quickfix window. (Lifepillar, 2018 Aug 24,
#2999)
Tests failing for "make testgui" with GTK: Tests failing for "make testgui" with GTK:
- Test_setbufvar_options() - Test_setbufvar_options()
- Test_exit_callback_interval() - Test_exit_callback_interval()
@ -224,6 +243,7 @@ On Win32 it stops showing, because showState is already ShS_SHOWING.
balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec
20, #2481) 20, #2481)
Also see #2352, want better control over balloon, perhaps set the position. Also see #2352, want better control over balloon, perhaps set the position.
Should also be possible to add highlighting, like in the status line?
Try out background make plugin: Try out background make plugin:
https://github.com/AndrewVos/vim-make-background https://github.com/AndrewVos/vim-make-background
@ -239,9 +259,14 @@ used for git temp files.
Cursor in wrong position when line wraps. (#2540) Cursor in wrong position when line wraps. (#2540)
Patch to parse ":line" in tags file and use it for search. (Daniel Hahler,
#2546) Fixes #1057. Missing a test.
Make {skip} argument of searchpair() consistent with other places where we Make {skip} argument of searchpair() consistent with other places where we
pass an expression to evaluate. Allow passing zero for "never skip". pass an expression to evaluate. Allow passing zero for "never skip".
The 'scrolloff' option is global, make it global-local. #3195
Add an option similar to 'lazyredraw' to skip redrawing while executing a Add an option similar to 'lazyredraw' to skip redrawing while executing a
script or function. script or function.
@ -281,6 +306,9 @@ How to test that it works well for all Vim users?
Alternative manpager.vim. (Enno, 2018 Jan 5, #2529) Alternative manpager.vim. (Enno, 2018 Jan 5, #2529)
Delete all the speficic stuff for the Borland compiler? (#3374)
Patch in #3377 (Thomas Dziedzic)
Does setting 'cursorline' cause syntax highlighting to slow down? Perhaps is Does setting 'cursorline' cause syntax highlighting to slow down? Perhaps is
mess up the cache? (Mike Lee Williams, 2018 Jan 27, #2539) mess up the cache? (Mike Lee Williams, 2018 Jan 27, #2539)
Also: 'foldtext' is evaluated too often. (Daniel Hahler, #2773) Also: 'foldtext' is evaluated too often. (Daniel Hahler, #2773)
@ -320,7 +348,8 @@ sequence of these commands. (Andy Stewart, 2018 Mar 16)
ch_sendraw() with long string does not try to read in between, which may cause ch_sendraw() with long string does not try to read in between, which may cause
a deadlock if the reading side is waiting for the write to finish. (Nate a deadlock if the reading side is waiting for the write to finish. (Nate
Bosch, 2018 Jan 13, #2548) Bosch, 2018 Jan 13, #2548)
Perhaps just make chunks of 1024 bytes? Make the write non-blocking? Perhaps just make chunks of 1024 bytes?
Probably better: Make the write non-blocking
Also a problem on MS-Windows: #2828. Also a problem on MS-Windows: #2828.
Add Makefiles to the runtime/spell directory tree, since nobody uses Aap. Add Makefiles to the runtime/spell directory tree, since nobody uses Aap.
@ -388,6 +417,8 @@ No profile information for function that executes ":quit". (Daniel Hahler,
A function on a dictionary is not profiled. (ZyX, 2010 Dec 25) A function on a dictionary is not profiled. (ZyX, 2010 Dec 25)
Add script number to profile? (#3330 breaks tests).
A function defined locally and lambda's are not easily recognized. A function defined locally and lambda's are not easily recognized.
Mention where they were defined somewhere. Mention where they were defined somewhere.
@ -486,8 +517,6 @@ It can replace the BeOS code, which is likely not used anymore.
Now on github: #1856. Updated Oct 2017 Now on github: #1856. Updated Oct 2017
Got permission to include this under the Vim license. Got permission to include this under the Vim license.
Refactored HTML indent file. (Michael Lee, #1821)
Test_writefile_fails_conversion failure on Solaris because if different iconv Test_writefile_fails_conversion failure on Solaris because if different iconv
behavior. Skip when "uname" returns "SunOS"? (Pavel Heimlich, #1872) behavior. Skip when "uname" returns "SunOS"? (Pavel Heimlich, #1872)
@ -566,7 +595,7 @@ Profile of a dict function is lost when the dict is deleted. Would it be
possible to collect this? (Daniel Hahler, #2350) possible to collect this? (Daniel Hahler, #2350)
Add `:filter` support for various commands (Marcin Szamotulski, 2017 Nov 12 Add `:filter` support for various commands (Marcin Szamotulski, 2017 Nov 12
#2322) Now in #2327? #2322) Patch now in #2856.
When checking if a bufref is valid, also check the buffer number, to catch the When checking if a bufref is valid, also check the buffer number, to catch the
case of :bwipe followed by :new. case of :bwipe followed by :new.
@ -751,6 +780,7 @@ receiving Vim? Or make an exception for #, it's not useful remotely.
vertical split. (Haldean Brown, 2017 Mar 1) vertical split. (Haldean Brown, 2017 Mar 1)
Use ADDR_OTHER instead of ADDR_LINES for many more commands. Use ADDR_OTHER instead of ADDR_LINES for many more commands.
E.g. all the location list commands use a count.
Add tests for using number larger than number of lines in buffer. Add tests for using number larger than number of lines in buffer.
Might be useful to have isreadonly(), like we have islocked(). Might be useful to have isreadonly(), like we have islocked().

1
runtime/doc/usr_11.txt
View File

@ -284,6 +284,7 @@ If you really don't want to see this message, you can add the 'A' flag to the
'shortmess' option. But it's very unusual that you need this. 'shortmess' option. But it's very unusual that you need this.
For remarks about encryption and the swap file, see |:recover-crypt|. For remarks about encryption and the swap file, see |:recover-crypt|.
For programatic access to the swap file, see |swapinfo()|.
============================================================================== ==============================================================================
*11.4* Further reading *11.4* Further reading

1
runtime/doc/usr_41.txt
View File

@ -809,6 +809,7 @@ Buffers, windows and the argument list:
getwininfo() get a list with window information getwininfo() get a list with window information
getchangelist() get a list of change list entries getchangelist() get a list of change list entries
getjumplist() get a list of jump list entries getjumplist() get a list of jump list entries
swapinfo() information about a swap file
Command line: *command-line-functions* Command line: *command-line-functions*
getcmdline() get the current command line getcmdline() get the current command line

4
runtime/ftplugin/haskell.vim
View File

@ -1,7 +1,8 @@
" Vim filetype plugin file " Vim filetype plugin file
" Language: Haskell " Language: Haskell
" Maintainer: Daniel Campoverde <alx@sillybytes.net>
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09 " Latest Revision: 2018-08-27
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
finish finish
@ -15,6 +16,7 @@ let b:undo_ftplugin = "setl com< cms< fo<"
setlocal comments=s1fl:{-,mb:-,ex:-},:-- commentstring=--\ %s setlocal comments=s1fl:{-,mb:-,ex:-},:-- commentstring=--\ %s
setlocal formatoptions-=t formatoptions+=croql setlocal formatoptions-=t formatoptions+=croql
setlocal omnifunc=haskellcomplete#Complete
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save

33
runtime/ftplugin/rmd.vim
View File

@ -2,7 +2,7 @@
" Language: R Markdown file " Language: R Markdown file
" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com> " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Mon Jun 06, 2016 09:41PM " Last Change: Sun Jul 22, 2018 06:51PM
" Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann) " Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann)
" Only do this when not yet done for this buffer " Only do this when not yet done for this buffer
@ -10,19 +10,12 @@ if exists("b:did_ftplugin")
finish finish
endif endif
runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim if exists('g:rmd_include_html') && g:rmd_include_html
runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
" Nvim-R plugin needs this
if exists("*CompleteR")
if &omnifunc == "CompleteR"
let b:rplugin_nonr_omnifunc = ""
else
let b:rplugin_nonr_omnifunc = &omnifunc
endif
set omnifunc=CompleteR
endif endif
setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s setlocal comments=fb:*,fb:-,fb:+,n:>
setlocal commentstring=#\ %s
setlocal formatoptions+=tcqln setlocal formatoptions+=tcqln
setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+ setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+
setlocal iskeyword=@,48-57,_,. setlocal iskeyword=@,48-57,_,.
@ -30,6 +23,22 @@ setlocal iskeyword=@,48-57,_,.
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
function! FormatRmd()
if search("^[ \t]*```[ ]*{r", "bncW") > search("^[ \t]*```$", "bncW")
setlocal comments=:#',:###,:##,:#
else
setlocal comments=fb:*,fb:-,fb:+,n:>
endif
return 1
endfunction
" If you do not want 'comments' dynamically defined, put in your vimrc:
" let g:rmd_dynamic_comments = 0
if !exists("g:rmd_dynamic_comments") || (exists("g:rmd_dynamic_comments") && g:rmd_dynamic_comments == 1)
setlocal formatexpr=FormatRmd()
endif
" Enables pandoc if it is installed " Enables pandoc if it is installed
unlet! b:did_ftplugin unlet! b:did_ftplugin
runtime ftplugin/pandoc.vim runtime ftplugin/pandoc.vim

20
runtime/ftplugin/rrst.vim
View File

@ -2,7 +2,7 @@
" Language: reStructuredText documentation format with R code " Language: reStructuredText documentation format with R code
" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com> " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Tue Apr 07, 2015 04:38PM " Last Change: Wed Nov 01, 2017 10:47PM
" Original work by Alex Zvoleff " Original work by Alex Zvoleff
" Only do this when not yet done for this buffer " Only do this when not yet done for this buffer
@ -16,11 +16,27 @@ let b:did_ftplugin = 1
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s setlocal comments=fb:*,fb:-,fb:+,n:>
setlocal commentstring=#\ %s
setlocal formatoptions+=tcqln setlocal formatoptions+=tcqln
setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+ setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+
setlocal iskeyword=@,48-57,_,. setlocal iskeyword=@,48-57,_,.
function! FormatRrst()
if search('^\.\. {r', "bncW") > search('^\.\. \.\.$', "bncW")
setlocal comments=:#',:###,:##,:#
else
setlocal comments=fb:*,fb:-,fb:+,n:>
endif
return 1
endfunction
" If you do not want 'comments' dynamically defined, put in your vimrc:
" let g:rrst_dynamic_comments = 0
if !exists("g:rrst_dynamic_comments") || (exists("g:rrst_dynamic_comments") && g:rrst_dynamic_comments == 1)
setlocal formatexpr=FormatRrst()
endif
if has("gui_win32") && !exists("b:browsefilter") if has("gui_win32") && !exists("b:browsefilter")
let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" . let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
\ "All Files (*.*)\t*.*\n" \ "All Files (*.*)\t*.*\n"

6
runtime/indent/dtd.vim
View File

@ -3,9 +3,6 @@
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2011-07-08 " Latest Revision: 2011-07-08
let s:cpo_save = &cpo
set cpo&vim
setlocal indentexpr=GetDTDIndent() setlocal indentexpr=GetDTDIndent()
setlocal indentkeys=!^F,o,O,> setlocal indentkeys=!^F,o,O,>
setlocal nosmartindent setlocal nosmartindent
@ -14,6 +11,9 @@ if exists("*GetDTDIndent")
finish finish
endif endif
let s:cpo_save = &cpo
set cpo&vim
" TODO: Needs to be adjusted to stop at [, <, and ]. " TODO: Needs to be adjusted to stop at [, <, and ].
let s:token_pattern = '^[^[:space:]]\+' let s:token_pattern = '^[^[:space:]]\+'

8
runtime/indent/html.vim
View File

@ -663,7 +663,7 @@ func! s:CSSIndent()
else else
let cur_hasfield = curtext =~ '^\s*[a-zA-Z0-9-]\+:' let cur_hasfield = curtext =~ '^\s*[a-zA-Z0-9-]\+:'
let prev_unfinished = s:CssUnfinished(prev_text) let prev_unfinished = s:CssUnfinished(prev_text)
if !cur_hasfield && (prev_hasfield || prev_unfinished) if prev_unfinished
" Continuation line has extra indent if the previous line was not a " Continuation line has extra indent if the previous line was not a
" continuation line. " continuation line.
let extra = shiftwidth() let extra = shiftwidth()
@ -716,9 +716,13 @@ func! s:CSSIndent()
endfunc "}}} endfunc "}}}
" Inside <style>: Whether a line is unfinished. " Inside <style>: Whether a line is unfinished.
" tag:
" tag: blah
" tag: blah &&
" tag: blah ||
func! s:CssUnfinished(text) func! s:CssUnfinished(text)
"{{{ "{{{
return a:text =~ '\s\(||\|&&\|:\)\s*$' return a:text =~ '\(||\|&&\|:\|\k\)\s*$'
endfunc "}}} endfunc "}}}
" Search back for the first unfinished line above "lnum". " Search back for the first unfinished line above "lnum".

37
runtime/indent/r.vim
View File

@ -2,7 +2,7 @@
" Language: R " Language: R
" Author: Jakson Alves de Aquino <jalvesaq@gmail.com> " Author: Jakson Alves de Aquino <jalvesaq@gmail.com>
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Thu Feb 18, 2016 06:32AM " Last Change: Sun Aug 19, 2018 09:13PM
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
@ -19,22 +19,16 @@ if exists("*GetRIndent")
finish finish
endif endif
let s:cpo_save = &cpo
set cpo&vim
" Options to make the indentation more similar to Emacs/ESS: " Options to make the indentation more similar to Emacs/ESS:
if !exists("g:r_indent_align_args") let g:r_indent_align_args = get(g:, 'r_indent_align_args', 1)
let g:r_indent_align_args = 1 let g:r_indent_ess_comments = get(g:, 'r_indent_ess_comments', 0)
endif let g:r_indent_comment_column = get(g:, 'r_indent_comment_column', 40)
if !exists("g:r_indent_ess_comments") let g:r_indent_ess_compatible = get(g:, 'r_indent_ess_compatible', 0)
let g:r_indent_ess_comments = 0 let g:r_indent_op_pattern = get(g:, 'r_indent_op_pattern',
endif \ '\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\)\s*$')
if !exists("g:r_indent_comment_column")
let g:r_indent_comment_column = 40
endif
if ! exists("g:r_indent_ess_compatible")
let g:r_indent_ess_compatible = 0
endif
if ! exists("g:r_indent_op_pattern")
let g:r_indent_op_pattern = '\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\)\s*$'
endif
function s:RDelete_quotes(line) function s:RDelete_quotes(line)
let i = 0 let i = 0
@ -231,7 +225,7 @@ function GetRIndent()
let cline = SanitizeRLine(cline) let cline = SanitizeRLine(cline)
if cline =~ '^\s*}' || cline =~ '^\s*}\s*)$' if cline =~ '^\s*}'
let indline = s:Get_matching_brace(clnum, '{', '}', 1) let indline = s:Get_matching_brace(clnum, '{', '}', 1)
if indline > 0 && indline != clnum if indline > 0 && indline != clnum
let iline = SanitizeRLine(getline(indline)) let iline = SanitizeRLine(getline(indline))
@ -244,6 +238,11 @@ function GetRIndent()
endif endif
endif endif
if cline =~ '^\s*)$'
let indline = s:Get_matching_brace(clnum, '(', ')', 1)
return indent(indline)
endif
" Find the first non blank line above the current line " Find the first non blank line above the current line
let lnum = s:Get_prev_line(clnum) let lnum = s:Get_prev_line(clnum)
" Hit the start of the file, use zero indent. " Hit the start of the file, use zero indent.
@ -515,7 +514,9 @@ function GetRIndent()
endwhile endwhile
return ind return ind
endfunction endfunction
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: sw=2 " vim: sw=2

25
runtime/indent/rmd.vim
View File

@ -2,7 +2,7 @@
" Language: Rmd " Language: Rmd
" Author: Jakson Alves de Aquino <jalvesaq@gmail.com> " Author: Jakson Alves de Aquino <jalvesaq@gmail.com>
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Tue Apr 07, 2015 04:38PM " Last Change: Sun Aug 19, 2018 09:14PM
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
@ -20,7 +20,10 @@ if exists("*GetRmdIndent")
finish finish
endif endif
function GetMdIndent() let s:cpo_save = &cpo
set cpo&vim
function s:GetMdIndent()
let pline = getline(v:lnum - 1) let pline = getline(v:lnum - 1)
let cline = getline(v:lnum) let cline = getline(v:lnum)
if prevnonblank(v:lnum - 1) < v:lnum - 1 || cline =~ '^\s*[-\+\*]\s' || cline =~ '^\s*\d\+\.\s\+' if prevnonblank(v:lnum - 1) < v:lnum - 1 || cline =~ '^\s*[-\+\*]\s' || cline =~ '^\s*\d\+\.\s\+'
@ -33,15 +36,31 @@ function GetMdIndent()
return indent(prevnonblank(v:lnum - 1)) return indent(prevnonblank(v:lnum - 1))
endfunction endfunction
function s:GetYamlIndent()
let pline = getline(v:lnum - 1)
if pline =~ ':\s*$'
return indent(v:lnum) + &sw
elseif pline =~ '^\s*- '
return indent(v:lnum) + 2
endif
return indent(prevnonblank(v:lnum - 1))
endfunction
function GetRmdIndent() function GetRmdIndent()
if getline(".") =~ '^[ \t]*```{r .*}$' || getline(".") =~ '^[ \t]*```$' if getline(".") =~ '^[ \t]*```{r .*}$' || getline(".") =~ '^[ \t]*```$'
return 0 return 0
endif endif
if search('^[ \t]*```{r', "bncW") > search('^[ \t]*```$', "bncW") if search('^[ \t]*```{r', "bncW") > search('^[ \t]*```$', "bncW")
return s:RIndent() return s:RIndent()
elseif v:lnum > 1 && search('^---$', "bnW") == 1 &&
\ (search('^---$', "nW") > v:lnum || search('^...$', "nW") > v:lnum)
return s:GetYamlIndent()
else else
return GetMdIndent() return s:GetMdIndent()
endif endif
endfunction endfunction
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: sw=2 " vim: sw=2

2
runtime/indent/rnoweb.vim
View File

@ -21,7 +21,7 @@ else
let s:TeXIndent = function(substitute(&indentexpr, "()", "", "")) let s:TeXIndent = function(substitute(&indentexpr, "()", "", ""))
endif endif
unlet b:did_indent unlet! b:did_indent
runtime indent/r.vim runtime indent/r.vim
let s:RIndent = function(substitute(&indentexpr, "()", "", "")) let s:RIndent = function(substitute(&indentexpr, "()", "", ""))
let b:did_indent = 1 let b:did_indent = 1

44
runtime/lang/menu_da.utf-8.vim
View File

@ -1,6 +1,6 @@
" Menu Translations: Danish / Dansk " Menu Translations: Danish
" Maintainer: scootergrisen " Maintainer: scootergrisen
" Last Change: 2018 Jun 23 " Last Change: 2018 Aug 17
" Quit when menu translations have already been done. " Quit when menu translations have already been done.
if exists("did_menu_trans") if exists("did_menu_trans")
@ -43,7 +43,7 @@ menut &Save<Tab>:w Gem<Tab>:w
menut Save\ &As\.\.\.<Tab>:sav Gem\ som\.\.\.<Tab>:sav menut Save\ &As\.\.\.<Tab>:sav Gem\ som\.\.\.<Tab>:sav
" -SEP2- " -SEP2-
menut Split\ &Diff\ with\.\.\. Opdel\ diff\ med\.\.\. menut Split\ &Diff\ with\.\.\. Opdel\ diff\ med\.\.\.
menut Split\ Patched\ &By\.\.\. Opdel\ "patchet\ af"\.\.\. menut Split\ Patched\ &By\.\.\. Opdel\ patchet\ af\.\.\.
" -SEP3- " -SEP3-
menut &Print Udskriv menut &Print Udskriv
" -SEP4- " -SEP4-
@ -79,7 +79,7 @@ menut Question Spørgsmål
" Edit " Edit
menut Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Fremhævning\ af\ mønster\ til/fra<Tab>:set\ hls! menut Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Fremhævning\ af\ mønster\ til/fra<Tab>:set\ hls!
menut Toggle\ &Ignoring\ Case<Tab>:set\ ic! Ignorerer\ "forskel\ på\ store\ og\ små\ bogstaver"\ til/fra<Tab>:set\ ic! menut Toggle\ &Ignoring\ Case<Tab>:set\ ic! Ignorerer\ forskel\ på\ store\ og\ små\ bogstaver\ til/fra<Tab>:set\ ic!
menut Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Viser\ matchende\ par\ til/fra<Tab>:set\ sm! menut Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Viser\ matchende\ par\ til/fra<Tab>:set\ sm!
menut &Context\ lines Kontekstlinjer menut &Context\ lines Kontekstlinjer
@ -117,20 +117,20 @@ menut Toggle\ Tab\ &expanding<Tab>:set\ et! Udvidelse\ af\ tabulator\ til/fra<Ta
menut Toggle\ &Auto\ Indenting<Tab>:set\ ai! Automatisk\ indrykning\ til/fra<Tab>:set\ ai! menut Toggle\ &Auto\ Indenting<Tab>:set\ ai! Automatisk\ indrykning\ til/fra<Tab>:set\ ai!
menut Toggle\ &C-Style\ Indenting<Tab>:set\ cin! Indrykning\ i\ &C-stil\ til/fra<Tab>:set\ cin! menut Toggle\ &C-Style\ Indenting<Tab>:set\ cin! Indrykning\ i\ &C-stil\ til/fra<Tab>:set\ cin!
" -SEP2- " -SEP2-
menut &Shiftwidth "Shiftwidth" menut &Shiftwidth Shiftwidth
" menut &Shiftwidth.2<Tab>:set\ sw=2\ sw?<CR> "Shiftwidth".2<Tab>:set\ sw=2\ sw?<CR> " menut &Shiftwidth.2<Tab>:set\ sw=2\ sw?<CR> Shiftwidth.2<Tab>:set\ sw=2\ sw?<CR>
" menut &Shiftwidth.3<Tab>:set\ sw=3\ sw?<CR> "Shiftwidth".3<Tab>:set\ sw=3\ sw?<CR> " menut &Shiftwidth.3<Tab>:set\ sw=3\ sw?<CR> Shiftwidth.3<Tab>:set\ sw=3\ sw?<CR>
" menut &Shiftwidth.4<Tab>:set\ sw=4\ sw?<CR> "Shiftwidth".4<Tab>:set\ sw=4\ sw?<CR> " menut &Shiftwidth.4<Tab>:set\ sw=4\ sw?<CR> Shiftwidth.4<Tab>:set\ sw=4\ sw?<CR>
" menut &Shiftwidth.5<Tab>:set\ sw=5\ sw?<CR> "Shiftwidth".5<Tab>:set\ sw=5\ sw?<CR> " menut &Shiftwidth.5<Tab>:set\ sw=5\ sw?<CR> Shiftwidth.5<Tab>:set\ sw=5\ sw?<CR>
" menut &Shiftwidth.6<Tab>:set\ sw=6\ sw?<CR> "Shiftwidth".6<Tab>:set\ sw=6\ sw?<CR> " menut &Shiftwidth.6<Tab>:set\ sw=6\ sw?<CR> Shiftwidth.6<Tab>:set\ sw=6\ sw?<CR>
" menut &Shiftwidth.8<Tab>:set\ sw=8\ sw?<CR> "Shiftwidth".8<Tab>:set\ sw=8\ sw?<CR> " menut &Shiftwidth.8<Tab>:set\ sw=8\ sw?<CR> Shiftwidth.8<Tab>:set\ sw=8\ sw?<CR>
menut Soft\ &Tabstop Blødt\ tabulatorstop menut Soft\ &Tabstop Blødt\ tabulatorstop
" menut Soft\ &Tabstop.2<Tab>:set\ sts=2\ sts? Blødt\ "Tabstop".2<Tab>:set\ sts=2\ sts? " menut Soft\ &Tabstop.2<Tab>:set\ sts=2\ sts? Blødt\ Tabstop.2<Tab>:set\ sts=2\ sts?
" menut Soft\ &Tabstop.3<Tab>:set\ sts=3\ sts? Blødt\ "Tabstop".3<Tab>:set\ sts=3\ sts? " menut Soft\ &Tabstop.3<Tab>:set\ sts=3\ sts? Blødt\ Tabstop.3<Tab>:set\ sts=3\ sts?
" menut Soft\ &Tabstop.4<Tab>:set\ sts=4\ sts? Blødt\ "Tabstop".4<Tab>:set\ sts=4\ sts? " menut Soft\ &Tabstop.4<Tab>:set\ sts=4\ sts? Blødt\ Tabstop.4<Tab>:set\ sts=4\ sts?
" menut Soft\ &Tabstop.5<Tab>:set\ sts=5\ sts? Blødt\ "Tabstop".5<Tab>:set\ sts=5\ sts? " menut Soft\ &Tabstop.5<Tab>:set\ sts=5\ sts? Blødt\ Tabstop.5<Tab>:set\ sts=5\ sts?
" menut Soft\ &Tabstop.6<Tab>:set\ sts=6\ sts? Blødt\ "Tabstop".6<Tab>:set\ sts=6\ sts? " menut Soft\ &Tabstop.6<Tab>:set\ sts=6\ sts? Blødt\ Tabstop.6<Tab>:set\ sts=6\ sts?
" menut Soft\ &Tabstop.8<Tab>:set\ sts=8\ sts? Blødt\ "Tabstop".8<Tab>:set\ sts=8\ sts? " menut Soft\ &Tabstop.8<Tab>:set\ sts=8\ sts? Blødt\ Tabstop.8<Tab>:set\ sts=8\ sts?
menut Te&xt\ Width\.\.\. Tekstbredde\.\.\. menut Te&xt\ Width\.\.\. Tekstbredde\.\.\.
menut &File\ Format\.\.\. Filformat\.\.\. menut &File\ Format\.\.\. Filformat\.\.\.
@ -168,11 +168,11 @@ menut None Intet
" menut arabic arabisk " menut arabic arabisk
" menut armenian-eastern armensk\ (østlig) " menut armenian-eastern armensk\ (østlig)
" menut armenian-western armensk\ (vestlig) " menut armenian-western armensk\ (vestlig)
" menut belarusian-jcuken hviderussisk"\ [belarusian-jcuken]" " menut belarusian-jcuken hviderussisk\ [belarusian-jcuken]
" menut czech tjekkisk " menut czech tjekkisk
" menut greek græsk " menut greek græsk
" menut hebrew hebraisk " menut hebrew hebraisk
" menut hebrewp hebraisk"\ [hebrewp]" " menut hebrewp hebraisk\ [hebrewp]
" menut magyar ungarsk " menut magyar ungarsk
" menut persian persisk " menut persian persisk
" menut serbian serbisk " menut serbian serbisk
@ -362,8 +362,10 @@ if has("toolbar")
endif endif
let g:menutrans_set_lang_to = "Sæt sprog til" let g:menutrans_set_lang_to = "Sæt sprog til"
let g:menutrans_spell_change_ARG_to = 'Ændr "%s" til'
let g:menutrans_spell_add_ARG_to_word_list = 'Tilføj "%s" til ordliste' " stavegenvejsmenu pop op ting
let g:menutrans_spell_change_ARG_to = 'Ændr\ "%s"\ til'
let g:menutrans_spell_add_ARG_to_word_list = 'Tilføj\ "%s"\ til\ ordliste'
let g:menutrans_spell_ignore_ARG = 'Ignorer "%s"' let g:menutrans_spell_ignore_ARG = 'Ignorer "%s"'
let &cpo = s:keepcpo let &cpo = s:keepcpo

2
runtime/menu.vim
View File

@ -356,6 +356,8 @@ func! s:SetupColorSchemes() abort
let s:did_setup_color_schemes = 1 let s:did_setup_color_schemes = 1
let n = globpath(&runtimepath, "colors/*.vim", 1, 1) let n = globpath(&runtimepath, "colors/*.vim", 1, 1)
let n += globpath(&runtimepath, "pack/*/start/*/colors/*.vim", 1, 1)
let n += globpath(&runtimepath, "pack/*/opt/*/colors/*.vim", 1, 1)
" Ignore case for VMS and windows, sort on name " Ignore case for VMS and windows, sort on name
let names = sort(map(n, 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1) let names = sort(map(n, 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1)

41
runtime/pack/dist/opt/cfilter/plugin/cfilter.vim vendored
View File

@ -1,15 +1,17 @@
" cfilter.vim: Plugin to filter entries from a quickfix/location list " cfilter.vim: Plugin to filter entries from a quickfix/location list
" Last Change: May 12, 2018 " Last Change: Aug 23, 2018
" Maintainer: Yegappan Lakshmanan (yegappan AT yahoo DOT com) " Maintainer: Yegappan Lakshmanan (yegappan AT yahoo DOT com)
" Version: 1.0 " Version: 1.1
" "
" Commands to filter the quickfix list: " Commands to filter the quickfix list:
" :Cfilter[!] {pat} " :Cfilter[!] /{pat}/
" Create a new quickfix list from entries matching {pat} in the current " Create a new quickfix list from entries matching {pat} in the current
" quickfix list. Both the file name and the text of the entries are " quickfix list. Both the file name and the text of the entries are
" matched against {pat}. If ! is supplied, then entries not matching " matched against {pat}. If ! is supplied, then entries not matching
" {pat} are used. " {pat} are used. The pattern can be optionally enclosed using one of
" :Lfilter[!] {pat} " the following characters: ', ", /. If the pattern is empty, then the
" last used search pattern is used.
" :Lfilter[!] /{pat}/
" Same as :Cfilter but operates on the current location list. " Same as :Cfilter but operates on the current location list.
" "
if exists("loaded_cfilter") if exists("loaded_cfilter")
@ -17,7 +19,7 @@ if exists("loaded_cfilter")
endif endif
let loaded_cfilter = 1 let loaded_cfilter = 1
func s:Qf_filter(qf, pat, bang) func s:Qf_filter(qf, searchpat, bang)
if a:qf if a:qf
let Xgetlist = function('getqflist') let Xgetlist = function('getqflist')
let Xsetlist = function('setqflist') let Xsetlist = function('setqflist')
@ -28,14 +30,31 @@ func s:Qf_filter(qf, pat, bang)
let cmd = ':Lfilter' . a:bang let cmd = ':Lfilter' . a:bang
endif endif
if a:bang == '!' let firstchar = a:searchpat[0]
let cond = 'v:val.text !~# a:pat && bufname(v:val.bufnr) !~# a:pat' let lastchar = a:searchpat[-1:]
if firstchar == lastchar &&
\ (firstchar == '/' || firstchar == '"' || firstchar == "'")
let pat = a:searchpat[1:-2]
if pat == ''
" Use the last search pattern
let pat = @/
endif
else else
let cond = 'v:val.text =~# a:pat || bufname(v:val.bufnr) =~# a:pat' let pat = a:searchpat
endif
if pat == ''
return
endif
if a:bang == '!'
let cond = 'v:val.text !~# pat && bufname(v:val.bufnr) !~# pat'
else
let cond = 'v:val.text =~# pat || bufname(v:val.bufnr) =~# pat'
endif endif
let items = filter(Xgetlist(), cond) let items = filter(Xgetlist(), cond)
let title = cmd . ' ' . a:pat let title = cmd . ' /' . pat . '/'
call Xsetlist([], ' ', {'title' : title, 'items' : items}) call Xsetlist([], ' ', {'title' : title, 'items' : items})
endfunc endfunc

32
runtime/syntax/r.vim
View File

@ -5,7 +5,7 @@
" Tom Payne <tom@tompayne.org> " Tom Payne <tom@tompayne.org>
" Contributor: Johannes Ranke <jranke@uni-bremen.de> " Contributor: Johannes Ranke <jranke@uni-bremen.de>
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Sat Apr 08, 2017 07:01PM " Last Change: Wed Aug 01, 2018 10:10PM
" Filenames: *.R *.r *.Rhistory *.Rt " Filenames: *.R *.r *.Rhistory *.Rt
" "
" NOTE: The highlighting of R functions might be defined in " NOTE: The highlighting of R functions might be defined in
@ -43,15 +43,17 @@ endif
if exists("g:r_syntax_folding") && g:r_syntax_folding if exists("g:r_syntax_folding") && g:r_syntax_folding
setlocal foldmethod=syntax setlocal foldmethod=syntax
endif endif
if !exists("g:r_syntax_hl_roxygen")
let g:r_syntax_hl_roxygen = 1 let g:r_syntax_hl_roxygen = get(g:, 'r_syntax_hl_roxygen', 1)
endif
syn case match syn case match
" Comment " Comment
syn match rCommentTodo contained "\(BUG\|FIXME\|NOTE\|TODO\):" syn match rCommentTodo contained "\(BUG\|FIXME\|NOTE\|TODO\):"
syn match rComment contains=@Spell,rCommentTodo,rOBlock "#.*" syn match rTodoParen contained "\(BUG\|FIXME\|NOTE\|TODO\)\s*(.\{-})\s*:" contains=rTodoKeyw,rTodoInfo transparent
syn keyword rTodoKeyw BUG FIXME NOTE TODO contained
syn match rTodoInfo "(\zs.\{-}\ze)" contained
syn match rComment contains=@Spell,rCommentTodo,rTodoParen,rOBlock "#.*"
" Roxygen " Roxygen
if g:r_syntax_hl_roxygen if g:r_syntax_hl_roxygen
@ -65,7 +67,7 @@ if g:r_syntax_hl_roxygen
" First we match all roxygen blocks as containing only a title. In case an " First we match all roxygen blocks as containing only a title. In case an
" empty roxygen line ending the title or a tag is found, this will be " empty roxygen line ending the title or a tag is found, this will be
" overriden later by the definitions of rOBlock. " overridden later by the definitions of rOBlock.
syn match rOTitleBlock "\%^\(\s*#\{1,2}' .*\n\)\{1,}" contains=rOCommentKey,rOTitleTag syn match rOTitleBlock "\%^\(\s*#\{1,2}' .*\n\)\{1,}" contains=rOCommentKey,rOTitleTag
syn match rOTitleBlock "^\s*\n\(\s*#\{1,2}' .*\n\)\{1,}" contains=rOCommentKey,rOTitleTag syn match rOTitleBlock "^\s*\n\(\s*#\{1,2}' .*\n\)\{1,}" contains=rOCommentKey,rOTitleTag
@ -91,7 +93,7 @@ if g:r_syntax_hl_roxygen
syn match rOTitle "^\s*\n\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*$" contained contains=rOCommentKey,rOTitleTag syn match rOTitle "^\s*\n\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*$" contained contains=rOCommentKey,rOTitleTag
syn match rOTitleTag contained "@title" syn match rOTitleTag contained "@title"
syn match rOCommentKey "#\{1,2}'" contained syn match rOCommentKey "^\s*#\{1,2}'" contained
syn region rOExamples start="^#\{1,2}' @examples.*"rs=e+1,hs=e+1 end="^\(#\{1,2}' @.*\)\@=" end="^\(#\{1,2}'\)\@!" contained contains=rOTag fold syn region rOExamples start="^#\{1,2}' @examples.*"rs=e+1,hs=e+1 end="^\(#\{1,2}' @.*\)\@=" end="^\(#\{1,2}'\)\@!" contained contains=rOTag fold
" rOTag list generated from the lists in " rOTag list generated from the lists in
@ -256,6 +258,7 @@ if exists("g:r_syntax_folding")
syn region rRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError fold syn region rRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError fold
syn region rRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError fold syn region rRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError fold
syn region rRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ transparent contains=ALLBUT,rError,rCurlyError,rParenError fold syn region rRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ transparent contains=ALLBUT,rError,rCurlyError,rParenError fold
syn region rSection matchgroup=Title start=/^#.*[-=#]\{4,}/ end=/^#.*[-=#]\{4,}/ms=s-2,me=s-1 transparent contains=ALL fold
else else
syn region rRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError syn region rRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError
syn region rRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError syn region rRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError
@ -282,13 +285,8 @@ endif
if g:r_syntax_fun_pattern == 1 if g:r_syntax_fun_pattern == 1
syn match rFunction '[0-9a-zA-Z_\.]\+\s*\ze(' syn match rFunction '[0-9a-zA-Z_\.]\+\s*\ze('
else else
if !exists("g:R_hi_fun") " Nvim-R:
let g:R_hi_fun = 1 runtime R/functions.vim
endif
if g:R_hi_fun
" Nvim-R:
runtime R/functions.vim
endif
endif endif
syn match rDollar display contained "\$" syn match rDollar display contained "\$"
@ -311,7 +309,7 @@ syn keyword rType array category character complex double function integer list
" Name of object with spaces " Name of object with spaces
if &filetype != "rmd" && &filetype != "rrst" if &filetype != "rmd" && &filetype != "rrst"
syn region rNameWSpace start="`" end="`" syn region rNameWSpace start="`" end="`" contains=rSpaceFun
endif endif
if &filetype == "rhelp" if &filetype == "rhelp"
@ -331,7 +329,10 @@ hi def link rAssign Statement
hi def link rBoolean Boolean hi def link rBoolean Boolean
hi def link rBraceError Error hi def link rBraceError Error
hi def link rComment Comment hi def link rComment Comment
hi def link rTodoParen Comment
hi def link rTodoInfo SpecialComment
hi def link rCommentTodo Todo hi def link rCommentTodo Todo
hi def link rTodoKeyw Todo
hi def link rComplex Number hi def link rComplex Number
hi def link rConditional Conditional hi def link rConditional Conditional
hi def link rConstant Constant hi def link rConstant Constant
@ -341,6 +342,7 @@ hi def link rDollar SpecialChar
hi def link rError Error hi def link rError Error
hi def link rFloat Float hi def link rFloat Float
hi def link rFunction Function hi def link rFunction Function
hi def link rSpaceFun Function
hi def link rHelpIdent Identifier hi def link rHelpIdent Identifier
hi def link rhPreProc PreProc hi def link rhPreProc PreProc
hi def link rhSection PreCondit hi def link rhSection PreCondit

175
runtime/syntax/rmd.vim
View File

@ -1,123 +1,118 @@
" markdown Text with R statements " markdown Text with R statements
" Language: markdown with R code chunks " Language: markdown with R code chunks
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Sat Jan 28, 2017 10:06PM " Last Change: Sat Aug 25, 2018 03:44PM
"
" CONFIGURATION:
" To highlight chunk headers as R code, put in your vimrc (e.g. .config/nvim/init.vim):
" let rmd_syn_hl_chunk = 1
" "
" For highlighting pandoc extensions to markdown like citations and TeX and " For highlighting pandoc extensions to markdown like citations and TeX and
" many other advanced features like folding of markdown sections, it is " many other advanced features like folding of markdown sections, it is
" recommended to install the vim-pandoc filetype plugin as well as the " recommended to install the vim-pandoc filetype plugin as well as the
" vim-pandoc-syntax filetype plugin from https://github.com/vim-pandoc. " vim-pandoc-syntax filetype plugin from https://github.com/vim-pandoc.
"
" TODO:
" - Provide highlighting for rmarkdown parameters in yaml header
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
endif endif
" load all of pandoc info, e.g. from " Configuration if not using pandoc syntax:
" Add syntax highlighting of YAML header
let g:rmd_syn_hl_yaml = get(g:, 'rmd_syn_hl_yaml', 1)
" Add syntax highlighting of citation keys
let g:rmd_syn_hl_citations = get(g:, 'rmd_syn_hl_citations', 1)
" Highlight the header of the chunk of R code
let g:rmd_syn_hl_chunk = get(g:, 'g:rmd_syn_hl_chunk', 0)
" Pandoc-syntax has more features, but it is slower.
" https://github.com/vim-pandoc/vim-pandoc-syntax " https://github.com/vim-pandoc/vim-pandoc-syntax
let g:pandoc#syntax#codeblocks#embeds#langs = get(g:, 'pandoc#syntax#codeblocks#embeds#langs', ['r'])
runtime syntax/pandoc.vim runtime syntax/pandoc.vim
if exists("b:current_syntax") if exists("b:current_syntax")
let rmdIsPandoc = 1 " Fix recognition of R code
unlet b:current_syntax syn region pandocDelimitedCodeBlock_r start=/^```{r\>.*}$/ end=/^```$/ contained containedin=pandocDelimitedCodeBlock contains=@R
else syn region rmdrInline matchgroup=rmdInlineDelim start="`r " end="`" contains=@R containedin=pandocLaTeXRegion,yamlFlowString keepend
let rmdIsPandoc = 0 hi def link rmdInlineDelim Delimiter
runtime syntax/markdown.vim let b:current_syntax = "rmd"
if exists("b:current_syntax") finish
unlet b:current_syntax
endif
" load all of the yaml syntax highlighting rules into @yaml
syntax include @yaml syntax/yaml.vim
if exists("b:current_syntax")
unlet b:current_syntax
endif
" highlight yaml block commonly used for front matter
syntax region rmdYamlBlock matchgroup=rmdYamlBlockDelim start="^---" matchgroup=rmdYamlBlockDelim end="^---" contains=@yaml keepend fold
endif endif
if !exists("g:rmd_syn_langs") let s:cpo_save = &cpo
let g:rmd_syn_langs = ["r"] set cpo&vim
else
let s:hasr = 0 " R chunks will not be highlighted by syntax/markdown because their headers
for s:lng in g:rmd_syn_langs " follow a non standard pattern: "```{lang" instead of "^```lang".
if s:lng == "r" " Make a copy of g:markdown_fenced_languages to highlight the chunks later:
let s:hasr = 1 if exists('g:markdown_fenced_languages')
endif if !exists('g:rmd_fenced_languages')
endfor let g:rmd_fenced_languages = deepcopy(g:markdown_fenced_languages)
if s:hasr == 0 let g:markdown_fenced_languages = []
let g:rmd_syn_langs += ["r"]
endif endif
else
let g:rmd_fenced_languages = ['r']
endif endif
for s:lng in g:rmd_syn_langs runtime syntax/markdown.vim
exe 'syntax include @' . toupper(s:lng) . ' syntax/'. s:lng . '.vim'
if exists("b:current_syntax")
unlet b:current_syntax
endif
exe 'syntax region rmd' . toupper(s:lng) . 'Chunk start="^[ \t]*``` *{\(' . s:lng . '\|r.*engine\s*=\s*["' . "']" . s:lng . "['" . '"]\).*}$" end="^[ \t]*```$" contains=@' . toupper(s:lng) . ',rmd' . toupper(s:lng) . 'ChunkDelim keepend fold'
if exists("g:rmd_syn_hl_chunk") && s:lng == "r" " Now highlight chunks:
" highlight R code inside chunk header for s:type in g:rmd_fenced_languages
syntax match rmdRChunkDelim "^[ \t]*```{r" contained if s:type =~ '='
syntax match rmdRChunkDelim "}$" contained let s:lng = substitute(s:type, '=.*', '')
let s:nm = substitute(s:type, '.*=', '')
else else
exe 'syntax match rmd' . toupper(s:lng) . 'ChunkDelim "^[ \t]*```{\(' . s:lng . '\|r.*engine\s*=\s*["' . "']" . s:lng . "['" . '"]\).*}$" contained' let s:lng = s:type
let s:nm = s:type
endif endif
exe 'syntax match rmd' . toupper(s:lng) . 'ChunkDelim "^[ \t]*```$" contained' unlet! b:current_syntax
exe 'syn include @Rmd'.s:nm.' syntax/'.s:lng.'.vim'
if g:rmd_syn_hl_chunk
exe 'syn region rmd'.s:nm.'ChunkDelim matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>" matchgroup=rmdCodeDelim end="}$" keepend containedin=rmd'.s:nm.'Chunk contains=@Rmd'.s:nm
exe 'syn region rmd'.s:nm.'Chunk start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=rmd'.s:nm.'ChunkDelim,@Rmd'.s:nm
else
exe 'syn region rmd'.s:nm.'Chunk matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=@Rmd'.s:nm
endif
exe 'syn region rmd'.s:nm.'Inline matchgroup=rmdInlineDelim start="`'.s:nm.' " end="`" contains=@Rmd'.s:nm.' keepend'
endfor endfor
unlet! s:type
hi def link rmdInlineDelim Delimiter
hi def link rmdCodeDelim Delimiter
" also match and syntax highlight in-line R code " You don't need this if either your markdown/syntax.vim already highlights
syntax region rmdrInline matchgroup=rmdInlineDelim start="`r " end="`" contains=@R containedin=pandocLaTeXRegion,yamlFlowString keepend " the YAML header or you are writing standard markdown
" I was not able to highlight rmdrInline inside a pandocLaTeXCommand, although if g:rmd_syn_hl_yaml
" highlighting works within pandocLaTeXRegion and yamlFlowString. " Minimum highlighting of yaml header
syntax cluster texMathZoneGroup add=rmdrInline syn match rmdYamlFieldTtl /^\s*\zs\w*\ze:/ contained
syn match rmdYamlFieldTtl /^\s*-\s*\zs\w*\ze:/ contained
" match slidify special marker syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start='"' skip='\\"' end='"' contains=yamlEscape,rmdrInline contained
syntax match rmdSlidifySpecial "\*\*\*" syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start="'" skip="''" end="'" contains=yamlSingleEscape,rmdrInline contained
syn match yamlEscape contained '\\\%([\\"abefnrtv\^0_ NLP\n]\|x\x\x\|u\x\{4}\|U\x\{8}\)'
syn match yamlSingleEscape contained "''"
if rmdIsPandoc == 0 syn region pandocYAMLHeader matchgroup=rmdYamlBlockDelim start=/\%(\%^\|\_^\s*\n\)\@<=\_^-\{3}\ze\n.\+/ end=/^\([-.]\)\1\{2}$/ keepend contains=rmdYamlFieldTtl,yamlFlowString
syn match rmdBlockQuote /^\s*>.*\n\(.*\n\@<!\n\)*/ skipnl hi def link rmdYamlBlockDelim Delimiter
" LaTeX hi def link rmdYamlFieldTtl Identifier
syntax include @LaTeX syntax/tex.vim hi def link yamlFlowString String
if exists("b:current_syntax")
unlet b:current_syntax
endif
" Inline
syntax match rmdLaTeXInlDelim "\$"
syntax match rmdLaTeXInlDelim "\\\$"
syn region texMathZoneX matchgroup=Delimiter start="\$" skip="\\\\\|\\\$" matchgroup=Delimiter end="\$" end="%stopzone\>" contains=@texMathZoneGroup
" Region
syntax match rmdLaTeXRegDelim "\$\$" contained
syntax match rmdLaTeXRegDelim "\$\$latex$" contained
syntax match rmdLaTeXSt "\\[a-zA-Z]\+"
syntax region rmdLaTeXRegion start="^\$\$" skip="\\\$" end="\$\$$" contains=@LaTeX,rmdLaTeXRegDelim keepend
syntax region rmdLaTeXRegion2 start="^\\\[" end="\\\]" contains=@LaTeX,rmdLaTeXRegDelim keepend
hi def link rmdBlockQuote Comment
hi def link rmdLaTeXSt Statement
hi def link rmdLaTeXInlDelim Special
hi def link rmdLaTeXRegDelim Special
endif endif
for s:lng in g:rmd_syn_langs " You don't need this if either your markdown/syntax.vim already highlights
exe 'syn sync match rmd' . toupper(s:lng) . 'SyncChunk grouphere rmd' . toupper(s:lng) . 'Chunk /^[ \t]*``` *{\(' . s:lng . '\|r.*engine\s*=\s*["' . "']" . s:lng . "['" . '"]\)/' " citations or you are writing standard markdown
endfor if g:rmd_syn_hl_citations
" From vim-pandoc-syntax
hi def link rmdYamlBlockDelim Delim " parenthetical citations
for s:lng in g:rmd_syn_langs syn match pandocPCite /\^\@<!\[[^\[\]]\{-}-\{0,1}@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*.\{-}\]/ contains=pandocEmphasis,pandocStrong,pandocLatex,pandocCiteKey,@Spell,pandocAmpersandEscape display
exe 'hi def link rmd' . toupper(s:lng) . 'ChunkDelim Special' " in-text citations with location
endfor syn match pandocICite /@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*\s\[.\{-1,}\]/ contains=pandocCiteKey,@Spell display
hi def link rmdInlineDelim Special " cite keys
hi def link rmdSlidifySpecial Special syn match pandocCiteKey /\(-\=@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*\)/ containedin=pandocPCite,pandocICite contains=@NoSpell display
syn match pandocCiteAnchor /[-@]/ contained containedin=pandocCiteKey display
syn match pandocCiteLocator /[\[\]]/ contained containedin=pandocPCite,pandocICite
hi def link pandocPCite Operator
hi def link pandocICite Operator
hi def link pandocCiteKey Label
hi def link pandocCiteAnchor Operator
hi def link pandocCiteLocator Operator
endif
let b:current_syntax = "rmd" let b:current_syntax = "rmd"
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: ts=8 sw=2 " vim: ts=8 sw=2

4
runtime/syntax/rnoweb.vim
View File

@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: R noweb Files " Language: R noweb Files
" Maintainer: Johannes Ranke <jranke@uni-bremen.de> " Maintainer: Johannes Ranke <jranke@uni-bremen.de>
" Last Change: Sat Feb 06, 2016 06:47AM " Last Change: Thu Apr 05, 2018 11:06PM
" Version: 0.9.1 " Version: 0.9.1
" Remarks: - This file is inspired by the proposal of " Remarks: - This file is inspired by the proposal of
" Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br> " Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br>
@ -16,7 +16,7 @@ syn case match
" Extension of Tex clusters {{{1 " Extension of Tex clusters {{{1
runtime syntax/tex.vim runtime syntax/tex.vim
unlet b:current_syntax unlet! b:current_syntax
syn cluster texMatchGroup add=@rnoweb syn cluster texMatchGroup add=@rnoweb
syn cluster texMathMatchGroup add=rnowebSexpr syn cluster texMathMatchGroup add=rnowebSexpr

4
runtime/syntax/rrst.vim
View File

@ -2,7 +2,7 @@
" Language: reST with R code chunks " Language: reST with R code chunks
" Maintainer: Alex Zvoleff, azvoleff@mail.sdsu.edu " Maintainer: Alex Zvoleff, azvoleff@mail.sdsu.edu
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Tue Jun 28, 2016 08:53AM " Last Change: Thu Apr 05, 2018 11:06PM
" "
" CONFIGURATION: " CONFIGURATION:
" To highlight chunk headers as R code, put in your vimrc: " To highlight chunk headers as R code, put in your vimrc:
@ -14,7 +14,7 @@ endif
" load all of the rst info " load all of the rst info
runtime syntax/rst.vim runtime syntax/rst.vim
unlet b:current_syntax unlet! b:current_syntax
" load all of the r syntax highlighting rules into @R " load all of the r syntax highlighting rules into @R
syntax include @R syntax/r.vim syntax include @R syntax/r.vim

70
runtime/syntax/sudoers.vim
View File

@ -1,8 +1,9 @@
" Vim syntax file " Vim syntax file
" Language: sudoers(5) configuration files " Language: sudoers(5) configuration files
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2018-07-19 " Latest Revision: 2018-08-18
" Recent Changes: Support for #include and #includedir. " Recent Changes: Support for #include and #includedir.
" Added many new options (Samuel D. Leslie)
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
@ -152,77 +153,120 @@ syn match sudoersDefaultTypeGreaterThan contained '>' nextgroup=@sudoersUser s
" TODO: could also deal with special characters here " TODO: could also deal with special characters here
syn match sudoersBooleanParameter contained '!' nextgroup=sudoersBooleanParameter skipwhite skipnl syn match sudoersBooleanParameter contained '!' nextgroup=sudoersBooleanParameter skipwhite skipnl
syn keyword sudoersBooleanParameter contained skipwhite skipnl syn keyword sudoersBooleanParameter contained skipwhite skipnl
\ always_query_group_plugin
\ always_set_home \ always_set_home
\ authenticate \ authenticate
\ closefrom_override \ closefrom_override
\ compress_io
\ env_editor \ env_editor
\ env_reset \ env_reset
\ exec_background
\ fast_glob
\ fqdn \ fqdn
\ ignore_audit_errors
\ ignore_dot \ ignore_dot
\ ignore_iolog_errors
\ ignore_local_sudoers \ ignore_local_sudoers
\ ignore_logfile_errors
\ ignore_unknown_defaults
\ insults \ insults
\ log_host \ log_host
\ log_input
\ log_output
\ log_year \ log_year
\ long_otp_prompt \ long_otp_prompt
\ mail_all_cmnds
\ mail_always \ mail_always
\ mail_badpass \ mail_badpass
\ mail_no_host \ mail_no_host
\ mail_no_perms \ mail_no_perms
\ mail_no_user \ mail_no_user
\ match_group_by_gid
\ netgroup_tuple
\ noexec \ noexec
\ path_info \ pam_session
\ pam_setcred
\ passprompt_override \ passprompt_override
\ path_info
\ preserve_groups \ preserve_groups
\ pwfeedback
\ requiretty \ requiretty
\ root_sudo \ root_sudo
\ rootpw \ rootpw
\ runaspw \ runaspw
\ set_home \ set_home
\ set_logname \ set_logname
\ set_utmp
\ setenv \ setenv
\ shell_noargs \ shell_noargs
\ stay_setuid \ stay_setuid
\ sudoedit_checkdir
\ sudoedit_fellow
\ syslog_pid
\ targetpw \ targetpw
\ tty_tickets \ tty_tickets
\ umask_override
\ use_netgroups
\ use_pty
\ user_command_timeouts
\ utmp_runas
\ visiblepw \ visiblepw
syn keyword sudoersIntegerParameter contained syn keyword sudoersIntegerParameter contained
\ nextgroup=sudoersIntegerParameterEquals \ nextgroup=sudoersIntegerParameterEquals
\ skipwhite skipnl \ skipwhite skipnl
\ closefrom \ closefrom
\ passwd_tries \ command_timeout
\ loglinelen \ loglinelen
\ maxseq
\ passwd_timeout \ passwd_timeout
\ passwd_tries
\ syslog_maxlen
\ timestamp_timeout \ timestamp_timeout
\ umask \ umask
syn keyword sudoersStringParameter contained syn keyword sudoersStringParameter contained
\ nextgroup=sudoersStringParameterEquals \ nextgroup=sudoersStringParameterEquals
\ skipwhite skipnl \ skipwhite skipnl
\ askpass
\ badpass_message \ badpass_message
\ editor \ editor
\ mailsub
\ noexec_file
\ passprompt
\ runas_default
\ syslog_badpri
\ syslog_goodpri
\ sudoers_locale
\ timestampdir
\ timestampowner
\ askpass
\ env_file \ env_file
\ exempt_group \ exempt_group
\ fdexec
\ group_plugin
\ iolog_dir
\ iolog_file
\ iolog_flush
\ iolog_group
\ iolog_mode
\ iolog_user
\ lecture \ lecture
\ lecture_file \ lecture_file
\ lecture_status_dir
\ listpw \ listpw
\ logfile \ logfile
\ mailerflags \ mailerflags
\ mailerpath \ mailerpath
\ mailfrom \ mailfrom
\ mailsub
\ mailto \ mailto
\ noexec_file
\ pam_login_service
\ pam_service
\ passprompt
\ restricted_env_file
\ role
\ runas_default
\ secure_path \ secure_path
\ sudoers_locale
\ syslog \ syslog
\ syslog_badpri
\ syslog_goodpri
\ timestamp_type
\ timestampdir
\ timestampowner
\ type
\ verifypw \ verifypw
syn keyword sudoersListParameter contained syn keyword sudoersListParameter contained

182
src/po/da.po
View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Vim 8.1\n" "Project-Id-Version: Vim 8.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-06-08 22:09+0200\n" "POT-Creation-Date: 2018-07-18 21:20+0200\n"
"PO-Revision-Date: 2018-06-23 23:30+0200\n" "PO-Revision-Date: 2018-08-17 00:15+0200\n"
"Last-Translator: scootergrisen\n" "Last-Translator: scootergrisen\n"
"Language-Team: Danish\n" "Language-Team: Danish\n"
"Language: da\n" "Language: da\n"
@ -184,10 +184,10 @@ msgid "All"
msgstr "Alt" msgstr "Alt"
msgid "Bot" msgid "Bot"
msgstr "Ned" msgstr "Nederst"
msgid "Top" msgid "Top"
msgstr "Øve" msgstr "Øverst"
msgid "" msgid ""
"\n" "\n"
@ -565,7 +565,8 @@ msgid "E115: Missing quote: %s"
msgstr "E115: Manglende citationstegn: %s" msgstr "E115: Manglende citationstegn: %s"
msgid "Not enough memory to set references, garbage collection aborted!" msgid "Not enough memory to set references, garbage collection aborted!"
msgstr "Ikke nok hukommelse til at sætte referencer, affaldsindsamling afbrudt!" msgstr ""
"Ikke nok hukommelse til at sætte referencer, affaldsindsamling afbrudt!"
msgid "E724: variable nested too deep for displaying" msgid "E724: variable nested too deep for displaying"
msgstr "E724: variabel indlejret for dybt til at blive vist" msgstr "E724: variabel indlejret for dybt til at blive vist"
@ -1415,6 +1416,9 @@ msgstr "E784: Kan ikke lukke sidste fanebladsside"
msgid "Already only one tab page" msgid "Already only one tab page"
msgstr "Allerede kun én fanebladsside" msgstr "Allerede kun én fanebladsside"
msgid "Edit File in new tab page"
msgstr "Rediger fil i ny fanebladsside"
msgid "Edit File in new window" msgid "Edit File in new window"
msgstr "Rediger fil i nyt vindue" msgstr "Rediger fil i nyt vindue"
@ -1645,7 +1649,7 @@ msgid ""
"# %s History (newest to oldest):\n" "# %s History (newest to oldest):\n"
msgstr "" msgstr ""
"\n" "\n"
"# %s Historik (nyeste til ældste):\n" "# %s historik (nyeste til ældste):\n"
msgid "Command Line" msgid "Command Line"
msgstr "Kommandolinje" msgstr "Kommandolinje"
@ -1672,7 +1676,7 @@ msgid "E812: Autocommands changed buffer or buffer name"
msgstr "E812: Autokommandoer ændrede buffer eller buffernavn" msgstr "E812: Autokommandoer ændrede buffer eller buffernavn"
msgid "Illegal file name" msgid "Illegal file name"
msgstr "Ulovlig filnavn" msgstr "Ulovligt filnavn"
msgid "is a directory" msgid "is a directory"
msgstr "er en mappe" msgstr "er en mappe"
@ -1957,7 +1961,8 @@ msgstr "Se \":help W12\" for mere info."
#, c-format #, c-format
msgid "W11: Warning: File \"%s\" has changed since editing started" msgid "W11: Warning: File \"%s\" has changed since editing started"
msgstr "W11: Advarsel: Filen \"%s\" er blevet ændret siden redigeringen startede" msgstr ""
"W11: Advarsel: Filen \"%s\" er blevet ændret siden redigeringen startede"
msgid "See \":help W11\" for more info." msgid "See \":help W11\" for more info."
msgstr "Se \":help W11\" for mere info." msgstr "Se \":help W11\" for mere info."
@ -1965,8 +1970,8 @@ msgstr "Se \":help W11\" for mere info."
#, c-format #, c-format
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
msgstr "" msgstr ""
"W16: Advarsel: Tilstanden af filen \"%s\" er blevet ændret siden redigeringen " "W16: Advarsel: Tilstanden af filen \"%s\" er blevet ændret siden "
"startede" "redigeringen startede"
msgid "See \":help W16\" for more info." msgid "See \":help W16\" for more info."
msgstr "Se \":help W16\" for mere info." msgstr "Se \":help W16\" for mere info."
@ -2025,10 +2030,10 @@ msgstr "E216: Ingen sådan gruppe eller hændelse: %s"
msgid "" msgid ""
"\n" "\n"
"--- Auto-Commands ---" "--- Autocommands ---"
msgstr "" msgstr ""
"\n" "\n"
"--- Auto-kommandoer ---" "--- Autokommandoer ---"
#, c-format #, c-format
msgid "E680: <buffer=%d>: invalid buffer number " msgid "E680: <buffer=%d>: invalid buffer number "
@ -2044,8 +2049,8 @@ msgid "E218: autocommand nesting too deep"
msgstr "E218: autokommando indlejret for dyb" msgstr "E218: autokommando indlejret for dyb"
#, c-format #, c-format
msgid "%s Auto commands for \"%s\"" msgid "%s Autocommands for \"%s\""
msgstr "%s Auto-kommandoer for \"%s\"" msgstr "%s Autokommandoer for \"%s\""
#, c-format #, c-format
msgid "Executing %s" msgid "Executing %s"
@ -2291,10 +2296,10 @@ msgstr "&Fortryd"
msgid "Open tab..." msgid "Open tab..."
msgstr "Åbn faneblad..." msgstr "Åbn faneblad..."
msgid "Find string (use '\\\\' to find a '\\')" msgid "Find string (use '\\\\' to find a '\\')"
msgstr "Find streng (brug '\\\\' til at finde et '\\')" msgstr "Find streng (brug '\\\\' til at finde et '\\')"
msgid "Find & Replace (use '\\\\' to find a '\\')" msgid "Find & Replace (use '\\\\' to find a '\\')"
msgstr "Find og erstat (brug '\\\\' til at finde et '\\')" msgstr "Find og erstat (brug '\\\\' til at finde et '\\')"
msgid "Not Used" msgid "Not Used"
@ -2878,7 +2883,8 @@ msgstr "Affald efter tilvalgsargument"
msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments" msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
msgstr "" msgstr ""
"For mange \"+kommando\"-, \"-c kommando\"- eller \"--cmd kommando\"-argumenter" "For mange \"+kommando\"-, \"-c kommando\"- eller \"--cmd kommando\"-"
"argumenter"
msgid "Invalid argument for" msgid "Invalid argument for"
msgstr "Ugyldigt argument for" msgstr "Ugyldigt argument for"
@ -2931,7 +2937,7 @@ msgstr ""
"\n" "\n"
"Mere info med: \"vim -h\"\n" "Mere info med: \"vim -h\"\n"
msgid "[file ..] edit specified file(s)" msgid "[file ..] edit specified file(s)"
msgstr "[fil ..] rediger angivne fil(er)" msgstr "[fil ..] rediger angivne fil(er)"
msgid "- read text from stdin" msgid "- read text from stdin"
@ -2946,11 +2952,11 @@ msgstr "-q [fejlfil] rediger fil med første fejl"
msgid "" msgid ""
"\n" "\n"
"\n" "\n"
"usage:" "Usage:"
msgstr "" msgstr ""
"\n" "\n"
"\n" "\n"
"anvendelse:" "Anvendelse:"
msgid " vim [arguments] " msgid " vim [arguments] "
msgstr " vim [argumenter] " msgstr " vim [argumenter] "
@ -3063,8 +3069,8 @@ msgstr "-f\t\t\tBrug ikke newcli til at åbne vindue"
msgid "-dev <device>\t\tUse <device> for I/O" msgid "-dev <device>\t\tUse <device> for I/O"
msgstr "-dev <enhed>\t\tBrug <enhed> til I/O" msgstr "-dev <enhed>\t\tBrug <enhed> til I/O"
msgid "-A\t\t\tstart in Arabic mode" msgid "-A\t\t\tStart in Arabic mode"
msgstr "-A\t\t\tstart i arabisk tilstand" msgstr "-A\t\t\tStart i arabisk tilstand"
msgid "-H\t\t\tStart in Hebrew mode" msgid "-H\t\t\tStart in Hebrew mode"
msgstr "-H\t\t\tStart i hebraisk tilstand" msgstr "-H\t\t\tStart i hebraisk tilstand"
@ -3113,7 +3119,8 @@ msgid "-c <command>\t\tExecute <command> after loading the first file"
msgstr "-c <kommando>\tUdfør <kommando> efter indlæsning af den første fil" msgstr "-c <kommando>\tUdfør <kommando> efter indlæsning af den første fil"
msgid "-S <session>\t\tSource file <session> after loading the first file" msgid "-S <session>\t\tSource file <session> after loading the first file"
msgstr "-S <session>\t\tSource filen <session> efter indlæsning af den første fil" msgstr ""
"-S <session>\t\tSource filen <session> efter indlæsning af den første fil"
msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>" msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
msgstr "-s <scriptind>\tLæs normal tilstand-kommandoer fra filen <scriptind>" msgstr "-s <scriptind>\tLæs normal tilstand-kommandoer fra filen <scriptind>"
@ -3180,7 +3187,8 @@ msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
msgstr "-i <viminfo>\t\tBrug <viminfo> i stedet for .viminfo" msgstr "-i <viminfo>\t\tBrug <viminfo> i stedet for .viminfo"
msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo" msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
msgstr "--clean\t\t'nocompatible', Vim-standarder, ingen plugins, ingen viminfo" msgstr ""
"--clean\t\t'nocompatible', Vim-standarder, ingen plugins, ingen viminfo"
msgid "-h or --help\tPrint Help (this message) and exit" msgid "-h or --help\tPrint Help (this message) and exit"
msgstr "-h eller --help\tUdskriv hjælp (denne meddelelse) og afslut" msgstr "-h eller --help\tUdskriv hjælp (denne meddelelse) og afslut"
@ -3486,21 +3494,22 @@ msgid ""
"If you entered a new crypt key but did not write the text file," "If you entered a new crypt key but did not write the text file,"
msgstr "" msgstr ""
"\n" "\n"
"Hvis du indtastede en ny crypt-nøgle men ikke skrev tekstfilen," "Hvis du indtastede en ny krypteringsnøgle men ikke skrev tekstfilen,"
msgid "" msgid ""
"\n" "\n"
"enter the new crypt key." "enter the new crypt key."
msgstr "" msgstr ""
"\n" "\n"
"så indtast den nye crypt-nøgle." "så indtast den nye krypteringsnøgle."
msgid "" msgid ""
"\n" "\n"
"If you wrote the text file after changing the crypt key press enter" "If you wrote the text file after changing the crypt key press enter"
msgstr "" msgstr ""
"\n" "\n"
"Hvis du skrev tekstfilen efter crypt-nøglen blev ændret, så tryk på enter" "Hvis du skrev tekstfilen efter krypteringsnøglen blev ændret, så tryk på "
"enter"
msgid "" msgid ""
"\n" "\n"
@ -3547,8 +3556,7 @@ msgstr "E311: Gendannelse afbrudt"
msgid "" msgid ""
"E312: Errors detected while recovering; look for lines starting with ???" "E312: Errors detected while recovering; look for lines starting with ???"
msgstr "" msgstr ""
"E312: Fejl registreret ved gendannelse; kig efter linjer som begynder med " "E312: Fejl registreret ved gendannelse; kig efter linjer som begynder med ???"
"???"
msgid "See \":help E312\" for more information." msgid "See \":help E312\" for more information."
msgstr "Se \":help E312\" for mere information." msgstr "Se \":help E312\" for mere information."
@ -3580,16 +3588,16 @@ msgstr ""
"\n" "\n"
msgid "Using crypt key from swap file for the text file.\n" msgid "Using crypt key from swap file for the text file.\n"
msgstr "Bruger crypt-nøglen fra swap-filen til tekstfilen.\n" msgstr "Bruger krypteringsnøglen fra swap-filen til tekstfilen.\n"
msgid "Swap files found:" msgid "Swap files found:"
msgstr "Swap-filer fundet:" msgstr "Swap-filer fundet:"
msgid " In current directory:\n" msgid " In current directory:\n"
msgstr " I nuværende mappe:\n" msgstr " I nuværende mappe:\n"
msgid " Using specified name:\n" msgid " Using specified name:\n"
msgstr " Bruger angivne navn:\n" msgstr " Bruger angivne navn:\n"
msgid " In directory " msgid " In directory "
msgstr " I mappe " msgstr " I mappe "
@ -3598,13 +3606,13 @@ msgid " -- none --\n"
msgstr " -- ingen --\n" msgstr " -- ingen --\n"
msgid " owned by: " msgid " owned by: "
msgstr " ejet af: " msgstr " ejet af: "
msgid " dated: " msgid " dated: "
msgstr " dateret: " msgstr " dateret: "
msgid " dated: " msgid " dated: "
msgstr " dateret: " msgstr " dateret: "
msgid " [from Vim version 3.0]" msgid " [from Vim version 3.0]"
msgstr " [fra Vim version 3.0]" msgstr " [fra Vim version 3.0]"
@ -3613,14 +3621,14 @@ msgid " [does not look like a Vim swap file]"
msgstr " [ligner ikke en Vim swap-fil]" msgstr " [ligner ikke en Vim swap-fil]"
msgid " file name: " msgid " file name: "
msgstr " filnavn: " msgstr " filnavn: "
msgid "" msgid ""
"\n" "\n"
" modified: " " modified: "
msgstr "" msgstr ""
"\n" "\n"
" ændret: " " ændret: "
msgid "YES" msgid "YES"
msgstr "JA" msgstr "JA"
@ -3633,7 +3641,7 @@ msgid ""
" user name: " " user name: "
msgstr "" msgstr ""
"\n" "\n"
" brugernavn: " " brugernavn: "
msgid " host name: " msgid " host name: "
msgstr " værtsnavn: " msgstr " værtsnavn: "
@ -3650,7 +3658,7 @@ msgid ""
" process ID: " " process ID: "
msgstr "" msgstr ""
"\n" "\n"
" proces-ID: " " proces-ID: "
msgid " (still running)" msgid " (still running)"
msgstr " (kører stadig)" msgstr " (kører stadig)"
@ -3758,9 +3766,11 @@ msgid ""
" file when making changes. Quit, or continue with caution.\n" " file when making changes. Quit, or continue with caution.\n"
msgstr "" msgstr ""
"\n" "\n"
"(1) Et andet program redigere muligvis den samme fil. Hvis det er tilfældet,\n" "(1) Et andet program redigere muligvis den samme fil. Hvis det er "
"tilfældet,\n"
" så pas på ikke at ende med to forskellige instanser af den samme\n" " så pas på ikke at ende med to forskellige instanser af den samme\n"
" fil når der foretages ændringer. Afslut, eller fortsæt med forsigtighed.\n" " fil når der foretages ændringer. Afslut, eller fortsæt med "
"forsigtighed.\n"
msgid "(2) An edit session for this file crashed.\n" msgid "(2) An edit session for this file crashed.\n"
msgstr "(2) En redigeringssession for filen holdt op med at virke.\n" msgstr "(2) En redigeringssession for filen holdt op med at virke.\n"
@ -4059,7 +4069,8 @@ msgstr "E347: Ikke flere fil \"%s\" fundet i path"
#, c-format #, c-format
msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\"" msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
msgstr "E668: Forkert adgangstilstand for NetBeans-forbindelsens info-fil: \"%s\"" msgstr ""
"E668: Forkert adgangstilstand for NetBeans-forbindelsens info-fil: \"%s\""
#, c-format #, c-format
msgid "E658: NetBeans connection lost for buffer %ld" msgid "E658: NetBeans connection lost for buffer %ld"
@ -4214,8 +4225,8 @@ msgid ""
"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of " "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
"%lld Bytes" "%lld Bytes"
msgstr "" msgstr ""
"Markerede %s%ld af %ld linje; %lld af %lld ord; %lld af %lld tegn; %lld af %" "Markerede %s%ld af %ld linje; %lld af %lld ord; %lld af %lld tegn; %lld af "
"lld byte" "%lld byte"
#, c-format #, c-format
msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld" msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
@ -4226,8 +4237,8 @@ msgid ""
"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte " "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
"%lld of %lld" "%lld of %lld"
msgstr "" msgstr ""
"Kol %s af %s; Linje %ld af %ld; Ord %lld af %lld; Tegn %lld af %lld; Byte %" "Kol %s af %s; Linje %ld af %ld; Ord %lld af %lld; Tegn %lld af %lld; Byte "
"lld af %lld" "%lld af %lld"
#, c-format #, c-format
msgid "(+%lld for BOM)" msgid "(+%lld for BOM)"
@ -4746,8 +4757,8 @@ msgstr "E55: Ikke-matchet %s)"
msgid "E66: \\z( not allowed here" msgid "E66: \\z( not allowed here"
msgstr "E66: \\z( ikke tilladt her" msgstr "E66: \\z( ikke tilladt her"
msgid "E67: \\z1 et al. not allowed here" msgid "E67: \\z1 - \\z9 not allowed here"
msgstr "E67: \\z1 og andre ikke tilladt her" msgstr "E67: \\z1 - \\z9 ikke tilladt her"
#, c-format #, c-format
msgid "E69: Missing ] after %s%%[" msgid "E69: Missing ] after %s%%["
@ -4757,6 +4768,9 @@ msgstr "E69: Manglende ] efter %s%%["
msgid "E70: Empty %s%%[]" msgid "E70: Empty %s%%[]"
msgstr "E70: Tom %s%%[]" msgstr "E70: Tom %s%%[]"
msgid "E956: Cannot use pattern recursively"
msgstr "E956: Kan ikke bruge mønster rekursivt"
msgid "E65: Illegal back reference" msgid "E65: Illegal back reference"
msgstr "E65: Ulovlig tilbage-reference" msgstr "E65: Ulovlig tilbage-reference"
@ -4859,8 +4873,8 @@ msgstr "E869: (NFA) Ukendt operator '\\@%c'"
msgid "E870: (NFA regexp) Error reading repetition limits" msgid "E870: (NFA regexp) Error reading repetition limits"
msgstr "E870: (NFA regexp) Fejl ved læsning af gentagelsesgrænser" msgstr "E870: (NFA regexp) Fejl ved læsning af gentagelsesgrænser"
msgid "E871: (NFA regexp) Can't have a multi follow a multi !" msgid "E871: (NFA regexp) Can't have a multi follow a multi"
msgstr "E871: (NFA regexp) En multi må ikke efterfølges af en multi !" msgstr "E871: (NFA regexp) En multi må ikke efterfølges af en multi"
msgid "E872: (NFA regexp) Too many '('" msgid "E872: (NFA regexp) Too many '('"
msgstr "E872: (NFA regexp) For mange '('" msgstr "E872: (NFA regexp) For mange '('"
@ -4871,8 +4885,11 @@ msgstr "E879: (NFA regexp) For mange \\z("
msgid "E873: (NFA regexp) proper termination error" msgid "E873: (NFA regexp) proper termination error"
msgstr "E873: (NFA regexp) fejl ved korrekt terminering" msgstr "E873: (NFA regexp) fejl ved korrekt terminering"
msgid "E874: (NFA) Could not pop the stack !" msgid "Could not open temporary log file for writing, displaying on stderr... "
msgstr "E874: (NFA) Kunne ikke pop'e stakken !" msgstr "Kunne ikke åbne midlertidig logfil til skrivning, viser på stderr... "
msgid "E874: (NFA) Could not pop the stack!"
msgstr "E874: (NFA) Kunne ikke pop'e stakken!"
msgid "" msgid ""
"E875: (NFA regexp) (While converting from postfix to NFA), too many states " "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
@ -4887,17 +4904,6 @@ msgstr "E876: (NFA regexp) Ikke nok plads til at lagre hele NFA'en "
msgid "E878: (NFA) Could not allocate memory for branch traversal!" msgid "E878: (NFA) Could not allocate memory for branch traversal!"
msgstr "E878: (NFA) Kunne ikke allokere hukommelse til gennemgang af gren!" msgstr "E878: (NFA) Kunne ikke allokere hukommelse til gennemgang af gren!"
msgid ""
"Could not open temporary log file for writing, displaying on stderr ... "
msgstr "Kunne ikke åbne midlertidig logfil til skrivning, viser på stderr ... "
#, c-format
msgid "(NFA) COULD NOT OPEN %s !"
msgstr "(NFA) KUNNE IKKE ÅBNE %s !"
msgid "Could not open temporary log file for writing "
msgstr "Kunne ikke åbne midlertidig logfil til skrivning "
msgid " VREPLACE" msgid " VREPLACE"
msgstr " VERSTAT" msgstr " VERSTAT"
@ -5008,6 +5014,7 @@ msgstr "E389: Kunne ikke finde mønster"
msgid "Substitute " msgid "Substitute "
msgstr "Erstatning " msgstr "Erstatning "
# scootergrisen: find ud af om "Søgemønster" skal være med stort eller lille
#, c-format #, c-format
msgid "" msgid ""
"\n" "\n"
@ -5023,11 +5030,13 @@ msgstr "E756: Stavekontrol er ikke aktiveret"
#, c-format #, c-format
msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\"" msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
msgstr "Advarsel: Kan ikke finde ordlisten \"%s_%s.spl\" eller \"%s_ascii.spl\"" msgstr ""
"Advarsel: Kan ikke finde ordlisten \"%s_%s.spl\" eller \"%s_ascii.spl\""
#, c-format #, c-format
msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\"" msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
msgstr "Advarsel: Kan ikke finde ordlisten \"%s.%s.spl\" eller \"%s.ascii.spl\"" msgstr ""
"Advarsel: Kan ikke finde ordlisten \"%s.%s.spl\" eller \"%s.ascii.spl\""
msgid "E797: SpellFileMissing autocommand deleted buffer" msgid "E797: SpellFileMissing autocommand deleted buffer"
msgstr "E797: SpellFileMissing-autokommando slettede buffer" msgstr "E797: SpellFileMissing-autokommando slettede buffer"
@ -5115,8 +5124,8 @@ msgid "E782: error while reading .sug file: %s"
msgstr "E782: fejl ved læsning af .sug-fil: %s" msgstr "E782: fejl ved læsning af .sug-fil: %s"
#, c-format #, c-format
msgid "Reading affix file %s ..." msgid "Reading affix file %s..."
msgstr "Læser affix-filen %s ..." msgstr "Læser affix-filen %s..."
#, c-format #, c-format
msgid "Conversion failure for word in %s line %d: %s" msgid "Conversion failure for word in %s line %d: %s"
@ -5251,8 +5260,8 @@ msgid "%s value differs from what is used in another .aff file"
msgstr "%s-værdi er ikke den samme som bruges i en anden .aff-fil" msgstr "%s-værdi er ikke den samme som bruges i en anden .aff-fil"
#, c-format #, c-format
msgid "Reading dictionary file %s ..." msgid "Reading dictionary file %s..."
msgstr "Læser ordbogsfilen %s ..." msgstr "Læser ordbogsfilen %s..."
#, c-format #, c-format
msgid "E760: No word count in %s" msgid "E760: No word count in %s"
@ -5279,8 +5288,8 @@ msgid "Ignored %d word(s) with non-ASCII characters in %s"
msgstr "Ignorerede %d ord med ikke-ASCII-tegn i %s" msgstr "Ignorerede %d ord med ikke-ASCII-tegn i %s"
#, c-format #, c-format
msgid "Reading word file %s ..." msgid "Reading word file %s..."
msgstr "Læser ordfilen %s ..." msgstr "Læser ordfilen %s..."
#, c-format #, c-format
msgid "Duplicate /encoding= line ignored in %s line %d: %s" msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@ -5336,8 +5345,8 @@ msgid "Total number of words: %d"
msgstr "Samlet antal ord: %d" msgstr "Samlet antal ord: %d"
#, c-format #, c-format
msgid "Writing suggestion file %s ..." msgid "Writing suggestion file %s..."
msgstr "Skriver forslagsfilen %s ..." msgstr "Skriver forslagsfilen %s..."
#, c-format #, c-format
msgid "Estimated runtime memory use: %d bytes" msgid "Estimated runtime memory use: %d bytes"
@ -5358,8 +5367,8 @@ msgid "Warning: both compounding and NOBREAK specified"
msgstr "Advarsel: både compounding og NOBREAK angivet" msgstr "Advarsel: både compounding og NOBREAK angivet"
#, c-format #, c-format
msgid "Writing spell file %s ..." msgid "Writing spell file %s..."
msgstr "Skriver spell-filen %s ..." msgstr "Skriver spell-filen %s..."
msgid "Done!" msgid "Done!"
msgstr "Færdig!" msgstr "Færdig!"
@ -5386,10 +5395,10 @@ msgid "No Syntax items defined for this buffer"
msgstr "Ingen syntakspunkter defineret for denne buffer" msgstr "Ingen syntakspunkter defineret for denne buffer"
msgid "syntax conceal on" msgid "syntax conceal on"
msgstr "syntax conceal on" msgstr "syntax conceal til"
msgid "syntax conceal off" msgid "syntax conceal off"
msgstr "syntax conceal off" msgstr "syntax conceal fra"
#, c-format #, c-format
msgid "E390: Illegal argument: %s" msgid "E390: Illegal argument: %s"
@ -5981,7 +5990,8 @@ msgstr "E129: Funktionsnavn kræves"
#, c-format #, c-format
msgid "E128: Function name must start with a capital or \"s:\": %s" msgid "E128: Function name must start with a capital or \"s:\": %s"
msgstr "E128: Funktionsnavnet skal begynde med et stort bogstav eller \"s:\": %s" msgstr ""
"E128: Funktionsnavnet skal begynde med et stort bogstav eller \"s:\": %s"
#, c-format #, c-format
msgid "E884: Function name cannot contain a colon: %s" msgid "E884: Function name cannot contain a colon: %s"
@ -6032,6 +6042,10 @@ msgstr "E133: :return ikke i en funktion"
msgid "E107: Missing parentheses: %s" msgid "E107: Missing parentheses: %s"
msgstr "E107: Manglende parenteser: %s" msgstr "E107: Manglende parenteser: %s"
#, c-format
msgid "%s (%s, compiled %s)"
msgstr "%s (%s, kompileret %s)"
msgid "" msgid ""
"\n" "\n"
"MS-Windows 64-bit GUI version" "MS-Windows 64-bit GUI version"
@ -6264,7 +6278,7 @@ msgid "type :help version8<Enter> for version info"
msgstr "skriv :help version8<Enter> for versionsinfo" msgstr "skriv :help version8<Enter> for versionsinfo"
msgid "Running in Vi compatible mode" msgid "Running in Vi compatible mode"
msgstr "Kører i Vi-kompatibel-tilstand" msgstr "Kører i Vi-kompatibel tilstand"
msgid "type :set nocp<Enter> for Vim defaults" msgid "type :set nocp<Enter> for Vim defaults"
msgstr "skriv :set nocp<Enter> for Vim-standarder" msgstr "skriv :set nocp<Enter> for Vim-standarder"
@ -6410,8 +6424,7 @@ msgstr "E11: Ugyldig i kommandolinjevindue; <CR> udfører, CTRL-C afslutter"
msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
msgstr "" msgstr ""
"E12: Kommando ikke tilladt fra exrc/vimrc i nuværende mappe- eller " "E12: Kommando ikke tilladt fra exrc/vimrc i nuværende mappe- eller tagsøgning"
"tagsøgning"
msgid "E171: Missing :endif" msgid "E171: Missing :endif"
msgstr "E171: Manglende :endif" msgstr "E171: Manglende :endif"
@ -6530,9 +6543,7 @@ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
msgstr "E26: Hebraisk kan ikke bruges: Ikke aktiveret ved kompileringstid\n" msgstr "E26: Hebraisk kan ikke bruges: Ikke aktiveret ved kompileringstid\n"
msgid "E27: Farsi cannot be used: Not enabled at compile time\n" msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
msgstr "" msgstr "E27: Persisk kan ikke bruges: Ikke aktiveret ved kompileringstid\n"
"E27: Persisk kan ikke bruges: Ikke aktiveret ved kompileringstid\n"
"\n"
msgid "E800: Arabic cannot be used: Not enabled at compile time\n" msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
msgstr "E800: Arabisk kan ikke bruges: Ikke aktiveret ved kompileringstid\n" msgstr "E800: Arabisk kan ikke bruges: Ikke aktiveret ved kompileringstid\n"
@ -6852,8 +6863,7 @@ msgstr "ventede 3-tuple som imp.find_module() resultat, men fik %s"
#, c-format #, c-format
msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d" msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
msgstr "" msgstr ""
"ventede 3-tuple som imp.find_module() resultat, men fik tuple af størrelse %" "ventede 3-tuple som imp.find_module() resultat, men fik tuple af størrelse %d"
"d"
msgid "internal error: imp.find_module returned tuple with NULL" msgid "internal error: imp.find_module returned tuple with NULL"
msgstr "intern fejl: imp.find_module returnerede tuple med NULL" msgstr "intern fejl: imp.find_module returnerede tuple med NULL"