Skip to content

Commit 790c18b

Browse files
committed
Update runtime files
1 parent 6bf2c62 commit 790c18b

10 files changed

Lines changed: 208 additions & 62 deletions

File tree

runtime/compiler/ocaml.vim

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
" Vim Compiler File
2-
" Compiler: ocaml
3-
" Maintainer: See ftplugin/ocaml.vim (?)
4-
" Last Change: June 2013 by Marc Weber
2+
" Compiler: ocaml
3+
" Maintainer: Markus Mottl <[email protected]>
4+
" URL: https://github.com/rgrinberg/vim-ocaml
5+
" Last Change:
6+
" 2017 Nov 26 - Improved error format (Markus Mottl)
7+
" 2013 Aug 27 - Added a new OCaml error format (Markus Mottl)
8+
" 2013 Jun 30 - Initial version (Marc Weber)
59
"
610
" Marc Weber's comments:
711
" Setting makeprg doesn't make sense, because there is ocamlc, ocamlopt,
@@ -17,7 +21,6 @@
1721
"
1822
" So having it here makes people opt-in
1923

20-
2124
if exists("current_compiler")
2225
finish
2326
endif
@@ -28,6 +31,7 @@ set cpo&vim
2831

2932
CompilerSet errorformat =
3033
\%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
34+
\%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d\ %.%#,
3135
\%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
3236
\%+EReference\ to\ unbound\ regexp\ name\ %m,
3337
\%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
@@ -38,6 +42,12 @@ CompilerSet errorformat =
3842
\%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
3943
\%D%*\\a:\ Entering\ directory\ `%f',
4044
\%X%*\\a:\ Leaving\ directory\ `%f',
45+
\%D%*\\a[%*\\d]:\ Entering\ directory\ '%f',
46+
\%X%*\\a[%*\\d]:\ Leaving\ directory\ '%f',
47+
\%D%*\\a:\ Entering\ directory\ '%f',
48+
\%X%*\\a:\ Leaving\ directory\ '%f',
49+
\%DEntering\ directory\ '%f',
50+
\%XLeaving\ directory\ '%f',
4151
\%DMaking\ %*\\a\ in\ %f
4252

4353
let &cpo = s:cpo_save

runtime/doc/autocmd.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 8.1. Last change: 2019 Jun 22
1+
*autocmd.txt* For Vim version 8.1. Last change: 2019 Jun 26
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -407,8 +407,8 @@ BufFilePost After changing the name of the current buffer
407407
BufFilePre Before changing the name of the current buffer
408408
with the ":file" or ":saveas" command.
409409
*BufHidden*
410-
BufHidden Just after a buffer has become hidden. That
411-
is, when there are no longer windows that show
410+
BufHidden Just before a buffer becomes hidden. That is,
411+
when there are no longer windows that show
412412
the buffer, but the buffer is not unloaded or
413413
deleted. Not used for ":qa" or ":q" when
414414
exiting Vim.

runtime/doc/intro.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*intro.txt* For Vim version 8.1. Last change: 2019 Jun 12
1+
*intro.txt* For Vim version 8.1. Last change: 2019 Jun 26
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -69,10 +69,17 @@ Frequently Asked Questions. Read this if you have problems.
6969
Downloading: https://www.vim.org/download.php
7070

7171

72+
Asking questions, finding answers: https://vi.stackexchange.com/
73+
"Vi and Vim Stack Exchange is a question and answer site for people using the
74+
vi and Vim families of text editors"
75+
76+
7277
Usenet News group where Vim is discussed: *news* *usenet*
7378
comp.editors
7479
This group is also for other editors. If you write about Vim, don't forget to
7580
mention that.
81+
You can access it here:
82+
https://groups.google.com/forum/#!topic/comp.editors
7683

7784
*mail-list* *maillist*
7885
There are several mailing lists for Vim:

runtime/doc/tags

Lines changed: 37 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4726,12 +4726,12 @@ E95 message.txt /*E95*
47264726
E950 message.txt /*E950*
47274727
E951 pattern.txt /*E951*
47284728
E952 autocmd.txt /*E952*
4729-
E953 eval.txt /*E953*
4729+
E953 terminal.txt /*E953*
47304730
E954 options.txt /*E954*
4731-
E955 eval.txt /*E955*
4731+
E955 terminal.txt /*E955*
47324732
E956 pattern.txt /*E956*
47334733
E957 eval.txt /*E957*
4734-
E958 eval.txt /*E958*
4734+
E958 terminal.txt /*E958*
47354735
E96 diff.txt /*E96*
47364736
E960 options.txt /*E960*
47374737
E961 cmdline.txt /*E961*
@@ -4773,7 +4773,7 @@ E993 popup.txt /*E993*
47734773
E994 eval.txt /*E994*
47744774
E995 eval.txt /*E995*
47754775
E996 eval.txt /*E996*
4776-
E996 popup.txt /*E996*
4776+
E997 popup.txt /*E997*
47774777
E999 repeat.txt /*E999*
47784778
EX intro.txt /*EX*
47794779
EXINIT starting.txt /*EXINIT*
@@ -5418,6 +5418,7 @@ break-finally eval.txt /*break-finally*
54185418
browse() eval.txt /*browse()*
54195419
browsedir() eval.txt /*browsedir()*
54205420
browsefilter editing.txt /*browsefilter*
5421+
bufadd() eval.txt /*bufadd()*
54215422
bufexists() eval.txt /*bufexists()*
54225423
buffer-functions usr_41.txt /*buffer-functions*
54235424
buffer-hidden windows.txt /*buffer-hidden*
@@ -5430,6 +5431,7 @@ buffer_number() eval.txt /*buffer_number()*
54305431
buffers windows.txt /*buffers*
54315432
buffers-menu gui.txt /*buffers-menu*
54325433
buflisted() eval.txt /*buflisted()*
5434+
bufload() eval.txt /*bufload()*
54335435
bufloaded() eval.txt /*bufloaded()*
54345436
bufname() eval.txt /*bufname()*
54355437
bufnr() eval.txt /*bufnr()*
@@ -8222,21 +8224,27 @@ popt-option print.txt /*popt-option*
82228224
popup popup.txt /*popup*
82238225
popup-buffer popup.txt /*popup-buffer*
82248226
popup-callback popup.txt /*popup-callback*
8227+
popup-close popup.txt /*popup-close*
82258228
popup-examples popup.txt /*popup-examples*
82268229
popup-filter popup.txt /*popup-filter*
8230+
popup-function-details popup.txt /*popup-function-details*
82278231
popup-functions popup.txt /*popup-functions*
82288232
popup-intro popup.txt /*popup-intro*
8233+
popup-mask popup.txt /*popup-mask*
82298234
popup-menu gui.txt /*popup-menu*
82308235
popup-menu-added version5.txt /*popup-menu-added*
82318236
popup-position popup.txt /*popup-position*
82328237
popup-props popup.txt /*popup-props*
8238+
popup-scrollbar popup.txt /*popup-scrollbar*
8239+
popup-usage popup.txt /*popup-usage*
82338240
popup-window popup.txt /*popup-window*
8241+
popup-window-functions usr_41.txt /*popup-window-functions*
82348242
popup.txt popup.txt /*popup.txt*
82358243
popup_atcursor() popup.txt /*popup_atcursor()*
82368244
popup_clear() popup.txt /*popup_clear()*
82378245
popup_close() popup.txt /*popup_close()*
82388246
popup_create() popup.txt /*popup_create()*
8239-
popup_create-usage popup.txt /*popup_create-usage*
8247+
popup_create-arguments popup.txt /*popup_create-arguments*
82408248
popup_dialog() popup.txt /*popup_dialog()*
82418249
popup_dialog-example popup.txt /*popup_dialog-example*
82428250
popup_filter_menu() popup.txt /*popup_filter_menu()*
@@ -9262,29 +9270,29 @@ term++open terminal.txt /*term++open*
92629270
term-dependent-settings term.txt /*term-dependent-settings*
92639271
term-list syntax.txt /*term-list*
92649272
term.txt term.txt /*term.txt*
9265-
term_dumpdiff() eval.txt /*term_dumpdiff()*
9266-
term_dumpload() eval.txt /*term_dumpload()*
9267-
term_dumpwrite() eval.txt /*term_dumpwrite()*
9268-
term_getaltscreen() eval.txt /*term_getaltscreen()*
9269-
term_getansicolors() eval.txt /*term_getansicolors()*
9270-
term_getattr() eval.txt /*term_getattr()*
9271-
term_getcursor() eval.txt /*term_getcursor()*
9272-
term_getjob() eval.txt /*term_getjob()*
9273-
term_getline() eval.txt /*term_getline()*
9274-
term_getscrolled() eval.txt /*term_getscrolled()*
9275-
term_getsize() eval.txt /*term_getsize()*
9276-
term_getstatus() eval.txt /*term_getstatus()*
9277-
term_gettitle() eval.txt /*term_gettitle()*
9278-
term_gettty() eval.txt /*term_gettty()*
9279-
term_list() eval.txt /*term_list()*
9280-
term_scrape() eval.txt /*term_scrape()*
9281-
term_sendkeys() eval.txt /*term_sendkeys()*
9282-
term_setansicolors() eval.txt /*term_setansicolors()*
9283-
term_setkill() eval.txt /*term_setkill()*
9284-
term_setrestore() eval.txt /*term_setrestore()*
9285-
term_setsize() eval.txt /*term_setsize()*
9286-
term_start() eval.txt /*term_start()*
9287-
term_wait() eval.txt /*term_wait()*
9273+
term_dumpdiff() terminal.txt /*term_dumpdiff()*
9274+
term_dumpload() terminal.txt /*term_dumpload()*
9275+
term_dumpwrite() terminal.txt /*term_dumpwrite()*
9276+
term_getaltscreen() terminal.txt /*term_getaltscreen()*
9277+
term_getansicolors() terminal.txt /*term_getansicolors()*
9278+
term_getattr() terminal.txt /*term_getattr()*
9279+
term_getcursor() terminal.txt /*term_getcursor()*
9280+
term_getjob() terminal.txt /*term_getjob()*
9281+
term_getline() terminal.txt /*term_getline()*
9282+
term_getscrolled() terminal.txt /*term_getscrolled()*
9283+
term_getsize() terminal.txt /*term_getsize()*
9284+
term_getstatus() terminal.txt /*term_getstatus()*
9285+
term_gettitle() terminal.txt /*term_gettitle()*
9286+
term_gettty() terminal.txt /*term_gettty()*
9287+
term_list() terminal.txt /*term_list()*
9288+
term_scrape() terminal.txt /*term_scrape()*
9289+
term_sendkeys() terminal.txt /*term_sendkeys()*
9290+
term_setansicolors() terminal.txt /*term_setansicolors()*
9291+
term_setkill() terminal.txt /*term_setkill()*
9292+
term_setrestore() terminal.txt /*term_setrestore()*
9293+
term_setsize() terminal.txt /*term_setsize()*
9294+
term_start() terminal.txt /*term_start()*
9295+
term_wait() terminal.txt /*term_wait()*
92889296
termcap term.txt /*termcap*
92899297
termcap-changed version4.txt /*termcap-changed*
92909298
termcap-colors term.txt /*termcap-colors*
@@ -9315,6 +9323,7 @@ terminal-debugger terminal.txt /*terminal-debugger*
93159323
terminal-diff terminal.txt /*terminal-diff*
93169324
terminal-diffscreendump terminal.txt /*terminal-diffscreendump*
93179325
terminal-dumptest terminal.txt /*terminal-dumptest*
9326+
terminal-function-details terminal.txt /*terminal-function-details*
93189327
terminal-functions usr_41.txt /*terminal-functions*
93199328
terminal-info term.txt /*terminal-info*
93209329
terminal-job-index index.txt /*terminal-job-index*

runtime/doc/todo.txt

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 8.1. Last change: 2019 Jun 19
1+
*todo.txt* For Vim version 8.1. Last change: 2019 Jul 04
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -47,13 +47,40 @@ Patch to fix session file when using multiple tabs. (Jason Franklin, 2019 May
4747
Also put :argadd commands at the start for all buffers, so that their order
4848
remains equal? Then %argdel to clean it up. Do try this with 'hidden' set.
4949

50-
Patch to add v:searchstat. (Takuya Fujiwara, #4446) Should be independent of
51-
'shortmess', filled on demand and cached until search changes.
52-
5350
Listener causes extra } to be inserted. (Paul Jolly, #4455)
5451

5552
Refactor: Move common things out of evalfunc.c, it's too big.
56-
E.g. vim_localtime().
53+
54+
Template string: review #4491
55+
56+
Terminal test fails when vim is configured with some features. (Dominique,
57+
#4597)
58+
59+
Popup windows:
60+
- Implement flip option
61+
- Have a way to scroll to the bottom? (#4577)
62+
- Why does 'nrformats' leak from the popup window buffer???
63+
- Disable commands, feedkeys(), CTRL-W, etc. in a popup window.
64+
Use ERROR_IF_POPUP_WINDOW for more commands.
65+
- Add 'balloonpopup': instead of showing text, let the callback open a popup
66+
window and return the window ID. The popup will then be closed when the
67+
mouse moves, except when it moves inside the popup.
68+
- For the "moved" property also include mouse movement?
69+
- Can the buffer be re-used if it was the last one, to avoid using up lots of
70+
buffer numbers?
71+
- Have an option to attach the popup to a text position, like text properties
72+
do. (#4560)
73+
- Make redrawing more efficient and avoid flicker:
74+
- put popup menu also put in popup_mask?
75+
- Invoke filter with character before mapping?
76+
- Figure out the size and position better.
77+
if wrapping splits a double-wide character
78+
if wrapping inserts indent
79+
- When drawing on top half a double-wide character, display ">" or "<" in the
80+
incomplete cell.
81+
- Use a popup window for the "info" item of completion instead of using a
82+
preview window. Ideas in issue #4544.
83+
How to add highlighting?
5784

5885
'incsearch' with :s: (#3321)
5986
- Get E20 when using command history to get "'<,'>s/a/b" and no Visual area
@@ -136,9 +163,14 @@ terminal.c and then CTRL-N twice.
136163
Should do current file first and not split it up when more results are found.
137164
(Also #1890)
138165

166+
Patch to use timers in matchparen. (Daniel Hahler, #1338)
167+
Ready to include now?
168+
139169
Adding "10" to 'spellsuggest' causes spell suggestions to become very slow.
140170
(#4087)
141171

172+
Patch to the code to get sign information. (Yegappan Lakshmanan, #4586)
173+
142174
":bnext" in a help buffer is supposed to go to the next help buffer, but it
143175
goes to any buffer, and then :bnext skips help buffers, since they are
144176
unlisted. (#4478)
@@ -171,17 +203,19 @@ Include part of #3242?
171203
When a terminal exit_cb closes the window, a following typed key is lost, if
172204
it's in a mapping. (2018 Oct 6, #2302, #3522)
173205

206+
Patch for Inno Setup: #2739
207+
174208
Internal diff doesn't handle binary file like external diff does. (Mike
175209
Williams, 2018 Oct 30)
176210

177211
Problem with :tlmenu: Detach item added with all modes? Issue #3563.
178212

179-
Patch to use timers in matchparen. (Daniel Hahler, #1338)
180-
Ready to include now?
181-
182213
The quoting of the [command] argument of :terminal is not clearly documented.
183214
Give a few examples. (#4288)
184215

216+
Opening a file with --remote-tab-silent that matches 'wildignore' does not
217+
work, results in (E479: No match". (#4610)
218+
185219
Bug: script written with "-W scriptout" contains Key codes, while the script
186220
read with "-s scriptin" expects escape codes. Probably "scriptout" needs to
187221
be adjusted. (Daniel Steinberg, 2019 Feb 24, #4041)

runtime/ftplugin/dune.vim

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
" Language: Dune buildsystem
2+
" Maintainer: Markus Mottl <[email protected]>
3+
" Anton Kochkov <[email protected]>
4+
" URL: https://github.com/rgrinberg/vim-ocaml
5+
" Last Change:
6+
" 2018 Nov 3 - Added commentstring (Markus Mottl)
7+
" 2017 Sep 6 - Initial version (Etienne Millon)
8+
9+
if exists("b:did_ftplugin")
10+
finish
11+
endif
12+
let b:did_ftplugin=1
13+
14+
set lisp
15+
16+
" Comment string
17+
setl commentstring=;\ %s
18+
setl comments=:;
19+
20+
setl iskeyword+=#,?,.,/

0 commit comments

Comments
 (0)