Skip to content

Commit 0d878b9

Browse files
committed
Update runtime files
1 parent 27efc62 commit 0d878b9

20 files changed

Lines changed: 869 additions & 294 deletions

File tree

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ runtime/ftplugin/dosbatch.vim @mrdubya
111111
runtime/ftplugin/eiffel.vim @dkearns
112112
runtime/ftplugin/erlang.vim @hcs42
113113
runtime/ftplugin/eruby.vim @tpope @dkearns
114+
runtime/ftplugin/fetchmail.vim @dkearns
114115
runtime/ftplugin/fpcmake.vim @dkearns
115116
runtime/ftplugin/freebasic.vim @dkearns
116117
runtime/ftplugin/fstab.vim @rid9
@@ -298,8 +299,10 @@ runtime/syntax/erlang.vim @hcs42
298299
runtime/syntax/eruby.vim @tpope @dkearns
299300
runtime/syntax/exports.vim @cecamp
300301
runtime/syntax/falcon.vim @steveno
302+
runtime/syntax/fetchmail.vim @dkearns
301303
runtime/syntax/forth.vim @jkotlinski
302304
runtime/syntax/fpcmake.vim @dkearns
305+
runtime/syntax/freebasic.vim @dkearns
303306
runtime/syntax/fstab.vim @rid9
304307
runtime/syntax/git.vim @tpope
305308
runtime/syntax/gitcommit.vim @tpope

Filelist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ SRC_ALL = \
1515
.gitignore \
1616
.hgignore \
1717
.lgtm.yml \
18-
.travis.yml \
1918
.appveyor.yml \
2019
.codecov.yml \
2120
ci/appveyor.bat \
@@ -1017,6 +1016,7 @@ LANG_GEN = \
10171016
runtime/spell/??/*.diff \
10181017
runtime/spell/??/main.aap \
10191018
runtime/spell/sr/README_sr.txt \
1019+
runtime/spell/sr/convert.vim \
10201020
runtime/spell/tet/*.diff \
10211021
runtime/spell/tet/main.aap \
10221022
runtime/spell/check/main.aap \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Vim Logo](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)
22

3-
[![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22) [![Travis Build Status](https://travis-ci.com/vim/vim.svg?branch=master)](https://travis-ci.com/github/vim/vim) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim) [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim) [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master) [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim) [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp) [![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim) [![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim) [![Fossies codespell report](https://fossies.org/linux/test/vim-master.tar.gz/codespell.svg)](https://fossies.org/linux/test/vim-master.tar.gz/codespell.html)
3+
[![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim) [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim) [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master) [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim) [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp) [![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim) [![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim) [![Fossies codespell report](https://fossies.org/linux/test/vim-master.tar.gz/codespell.svg)](https://fossies.org/linux/test/vim-master.tar.gz/codespell.html)
44

55
<sub>For translations of this README see the end.</sub>
66

runtime/autoload/freebasic.vim

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim filetype plugin file
22
" Language: FreeBASIC
33
" Maintainer: Doug Kearns <[email protected]>
4-
" Last Change: 2021 Mar 16
4+
" Last Change: 2022 June 24
55

66
" Dialects can be one of fb, qb, fblite, or deprecated
77
" Precedence is forcelang > #lang > lang
@@ -18,17 +18,16 @@ function! freebasic#GetDialect() abort
1818

1919
" override with #lang directive or metacommand
2020

21-
let skip = "has('syntax_items') && synIDattr(synID(line('.'), col('.'), 1), 'name') =~ 'Comment$'"
2221
let pat = '\c^\s*\%(#\s*lang\s\+\|''\s*$lang\s*:\s*\)"\([^"]*\)"'
2322

2423
let save_cursor = getcurpos()
2524
call cursor(1, 1)
26-
let lnum = search(pat, 'n', '', '', skip)
25+
let lnum = search(pat, 'cn')
2726
call setpos('.', save_cursor)
2827

2928
if lnum
3029
let word = matchlist(getline(lnum), pat)[1]
31-
if word =~? '\%(fb\|deprecated\|fblite\|qb\)'
30+
if word =~? '\<\%(fb\|deprecated\|fblite\|qb\)\>'
3231
let dialect = word
3332
else
3433
echomsg "freebasic#GetDialect: Invalid lang, found '" .. word .. "' at line " .. lnum .. " " .. getline(lnum)

runtime/doc/filetype.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,12 +556,30 @@ For further discussion of fortran_have_tabs and the method used for the
556556
detection of source format see |ft-fortran-syntax|.
557557

558558

559+
FREEBASIC *ft-freebasic-plugin*
560+
561+
This plugin aims to treat the four FreeBASIC dialects, "fb", "qb", "fblite"
562+
and "deprecated", as distinct languages.
563+
564+
The dialect will be set to the first name found in g:freebasic_forcelang, any
565+
#lang directive or $lang metacommand in the file being edited, or finally
566+
g:freebasic_lang. These global variables conceptually map to the fbc options
567+
-forcelang and -lang. If no dialect is explicitly specified "fb" will be
568+
used.
569+
570+
For example, to set the dialect to a default of "fblite" but still allow for
571+
any #lang directive overrides, use the following command: >
572+
573+
let g:freebasic_lang = "fblite"
574+
575+
559576
GIT COMMIT *ft-gitcommit-plugin*
560577

561578
One command, :DiffGitCached, is provided to show a diff of the current commit
562579
in the preview window. It is equivalent to calling "git diff --cached" plus
563580
any arguments given to the command.
564581

582+
565583
GPROF *ft-gprof-plugin*
566584

567585
The gprof filetype plugin defines a mapping <C-]> to jump from a function
@@ -571,6 +589,7 @@ to the details of that function in the call graph.
571589
The mapping can be disabled with: >
572590
let g:no_gprof_maps = 1
573591
592+
574593
MAIL *ft-mail-plugin*
575594

576595
Options:

runtime/doc/quickfix.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,9 @@ pattern is used.
568568
The |:Lfilter| command does the same as |:Cfilter| but operates on the current
569569
location list.
570570

571+
The current quickfix/location list is not modified by these commands, so you
572+
can go back to the unfiltered list using the |:colder|/|:lolder| command.
573+
571574
=============================================================================
572575
2. The error window *quickfix-window*
573576

runtime/doc/syntax.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,6 +1694,21 @@ because Fortran90 has no reserved words.
16941694
For further information related to fortran, see |ft-fortran-indent| and
16951695
|ft-fortran-plugin|.
16961696

1697+
FREEBASIC *freebasic.vim* *ft-freebasic-syntax*
1698+
1699+
FreeBASIC files will be highlighted differently for each of the four available
1700+
dialects, "fb", "qb", "fblite" and "deprecated". See |ft-freebasic-plugin|
1701+
for how to select the correct dialect.
1702+
1703+
Highlighting is further configurable via the following variables.
1704+
1705+
Variable Highlight ~
1706+
*freebasic_no_comment_fold* disable multiline comment folding
1707+
*freebasic_operators* non-alpha operators
1708+
*freebasic_space_errors* trailing white space and spaces before a <Tab>
1709+
*freebasic_type_suffixes* QuickBASIC style type suffixes
1710+
1711+
16971712

16981713
FVWM CONFIGURATION FILES *fvwm.vim* *ft-fvwm-syntax*
16991714

runtime/doc/tags

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,7 @@ $quote eval.txt /*$quote*
988988
't_Co' term.txt /*'t_Co'*
989989
't_Cs' term.txt /*'t_Cs'*
990990
't_DL' term.txt /*'t_DL'*
991+
't_Ds' term.txt /*'t_Ds'*
991992
't_EC' term.txt /*'t_EC'*
992993
't_EI' term.txt /*'t_EI'*
993994
't_F1' term.txt /*'t_F1'*
@@ -1044,6 +1045,7 @@ $quote eval.txt /*$quote*
10441045
't_TI' term.txt /*'t_TI'*
10451046
't_Te' term.txt /*'t_Te'*
10461047
't_Ts' term.txt /*'t_Ts'*
1048+
't_Us' term.txt /*'t_Us'*
10471049
't_VS' term.txt /*'t_VS'*
10481050
't_WP' term.txt /*'t_WP'*
10491051
't_WS' term.txt /*'t_WS'*
@@ -1059,6 +1061,7 @@ $quote eval.txt /*$quote*
10591061
't_da' term.txt /*'t_da'*
10601062
't_db' term.txt /*'t_db'*
10611063
't_dl' term.txt /*'t_dl'*
1064+
't_ds' term.txt /*'t_ds'*
10621065
't_fd' term.txt /*'t_fd'*
10631066
't_fe' term.txt /*'t_fe'*
10641067
't_fs' term.txt /*'t_fs'*
@@ -6875,6 +6878,11 @@ format-formatexpr change.txt /*format-formatexpr*
68756878
formatting change.txt /*formatting*
68766879
forth.vim syntax.txt /*forth.vim*
68776880
fortran.vim syntax.txt /*fortran.vim*
6881+
freebasic.vim syntax.txt /*freebasic.vim*
6882+
freebasic_no_comment_fold syntax.txt /*freebasic_no_comment_fold*
6883+
freebasic_operators syntax.txt /*freebasic_operators*
6884+
freebasic_space_errors syntax.txt /*freebasic_space_errors*
6885+
freebasic_type_suffixes syntax.txt /*freebasic_type_suffixes*
68786886
friendship intro.txt /*friendship*
68796887
frombook usr_01.txt /*frombook*
68806888
ft-abel-syntax syntax.txt /*ft-abel-syntax*
@@ -6931,6 +6939,8 @@ ft-forth-syntax syntax.txt /*ft-forth-syntax*
69316939
ft-fortran-indent indent.txt /*ft-fortran-indent*
69326940
ft-fortran-plugin filetype.txt /*ft-fortran-plugin*
69336941
ft-fortran-syntax syntax.txt /*ft-fortran-syntax*
6942+
ft-freebasic-plugin filetype.txt /*ft-freebasic-plugin*
6943+
ft-freebasic-syntax syntax.txt /*ft-freebasic-syntax*
69346944
ft-fvwm-syntax syntax.txt /*ft-fvwm-syntax*
69356945
ft-gitcommit-plugin filetype.txt /*ft-gitcommit-plugin*
69366946
ft-gprof-plugin filetype.txt /*ft-gprof-plugin*
@@ -9726,6 +9736,7 @@ t_Ce term.txt /*t_Ce*
97269736
t_Co term.txt /*t_Co*
97279737
t_Cs term.txt /*t_Cs*
97289738
t_DL term.txt /*t_DL*
9739+
t_Ds term.txt /*t_Ds*
97299740
t_EC term.txt /*t_EC*
97309741
t_EI term.txt /*t_EI*
97319742
t_F1 term.txt /*t_F1*
@@ -9782,6 +9793,7 @@ t_TE term.txt /*t_TE*
97829793
t_TI term.txt /*t_TI*
97839794
t_Te term.txt /*t_Te*
97849795
t_Ts term.txt /*t_Ts*
9796+
t_Us term.txt /*t_Us*
97859797
t_VS term.txt /*t_VS*
97869798
t_WP term.txt /*t_WP*
97879799
t_WS term.txt /*t_WS*
@@ -9808,6 +9820,7 @@ t_da term.txt /*t_da*
98089820
t_db term.txt /*t_db*
98099821
t_dict-variable eval.txt /*t_dict-variable*
98109822
t_dl term.txt /*t_dl*
9823+
t_ds term.txt /*t_ds*
98119824
t_ed version4.txt /*t_ed*
98129825
t_el version4.txt /*t_el*
98139826
t_f1 version4.txt /*t_f1*
@@ -10204,7 +10217,11 @@ u undo.txt /*u*
1020410217
uganda uganda.txt /*uganda*
1020510218
uganda.txt uganda.txt /*uganda.txt*
1020610219
undercurl syntax.txt /*undercurl*
10220+
underdashed syntax.txt /*underdashed*
10221+
underdotted syntax.txt /*underdotted*
10222+
underdouble syntax.txt /*underdouble*
1020710223
underline syntax.txt /*underline*
10224+
underline-codes syntax.txt /*underline-codes*
1020810225
undo undo.txt /*undo*
1020910226
undo-blocks undo.txt /*undo-blocks*
1021010227
undo-branches undo.txt /*undo-branches*

runtime/doc/todo.txt

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ browser use: https://github.com/vim/vim/issues/1234
3838
*known-bugs*
3939
-------------------- Known bugs and current work -----------------------
4040

41-
Prepare for the Vim 9.0 release:
42-
- Update version number in help
43-
4441
Further Vim9 improvements, possibly after launch:
4542
- Use Vim9 for more runtime files.
4643
- Check performance with callgrind and kcachegrind.
@@ -201,19 +198,11 @@ Terminal emulator window:
201198
conversions.
202199

203200
Patches considered for including:
204-
- make functions static if possible, add a few tests. #10612
205-
- use ngettext() in a few more places #10606
206-
- move f_hasmapto() to map.c #10611
201+
- Add "-n" option to xxd. #10599 needs a test
207202
- allow for nesting of timeout, sketch in #10595
208-
- Add "-n" option to xxd. #10599
209-
- Add support for "underdouble", "underdot" and "underdash". #9553
210203
- Patch to implement the vimtutor with a plugin: #6414
211204
Was originally written by Felipe Morales.
212205
- Patch to make fillchars global-local. (#5206)
213-
- Version of getchar() that does not move the cursor - #10603
214-
Use a separate argument for the new flag.
215-
- Improved VB filetype detection. (Doug Kearns, June 26)
216-
- Improved FreeBasic runtime files (and a second one). (Doug Kearns, June 26)
217206

218207
Autoconf: must use autoconf 2.69, later version generates lots of warnings
219208
- try using autoconf 2.71 and fix all "obsolete" warnings
@@ -236,6 +225,8 @@ pass it on with modifications.
236225

237226
Can "CSI nr X" be used instead of outputting spaces? Is it faster? #8002
238227

228+
Typed keys invisible after calling interrupt() from a timer. #10631
229+
239230
With a window height of 6 and 'scrolloff' set to 3, using "j" does not scroll
240231
evenly. (#10545) Need to handle this in scroll_cursor_bot().
241232

@@ -254,6 +245,9 @@ The line number can be obtained from win->w_lines[].
254245

255246
MS-Windows: did path modifier :p:8 stop working? #8600
256247

248+
Version of getchar() that does not move the cursor - #10603 Use a separate
249+
argument for the new flag.
250+
257251
test_arglist func Test_all_not_allowed_from_cmdwin() hangs on MS-Windows.
258252

259253
Information for a specific terminal (e.g. gnome, tmux, konsole, alacritty) is
@@ -295,6 +289,8 @@ inconsistent with the documentation.
295289

296290
globpath() does not use 'wildignorecase' at all? (related to #8350)
297291

292+
mksession uses :buffer instead of :edit in one place but not another. #10629
293+
298294
Add 'termguiattr' option, use "gui=" attributes in the terminal? Would work
299295
with 'termguicolors'. #1740
300296

@@ -4423,6 +4419,8 @@ GUI:
44234419

44244420

44254421
Autocommands:
4422+
9 Add WinNewPre - before creating a new window. #10635
4423+
9 When triggering WinNew provide the window ID somehow. #10633
44264424
9 Rework the code from FEAT_OSFILETYPE for autocmd-osfiletypes to use
44274425
'filetype'. Only for when the current buffer is known.
44284426
- Put autocommand event names in a hashtable for faster lookup?

runtime/doc/xxd.man

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ OPTIONS
4646
long line of output.
4747

4848
-C | -capitalize
49-
Capitalize variable names in C include file style, when using
49+
Capitalize variable names in C include file style, when using
5050
-i.
5151

5252
-E | -EBCDIC
@@ -57,28 +57,32 @@ OPTIONS
5757
-e Switch to little-endian hexdump. This option treats byte groups
5858
as words in little-endian byte order. The default grouping of 4
5959
bytes may be changed using -g. This option only applies to hex‐
60-
dump, leaving the ASCII (or EBCDIC) representation unchanged.
60+
dump, leaving the ASCII (or EBCDIC) representation unchanged.
6161
The command line switches -r, -p, -i do not work with this mode.
6262

6363
-g bytes | -groupsize bytes
64-
Separate the output of every <bytes> bytes (two hex characters
64+
Separate the output of every <bytes> bytes (two hex characters
6565
or eight bit-digits each) by a whitespace. Specify -g 0 to sup‐
6666
press grouping. <Bytes> defaults to 2 in normal mode, 4 in lit‐
67-
tle-endian mode and 1 in bits mode. Grouping does not apply to
67+
tle-endian mode and 1 in bits mode. Grouping does not apply to
6868
postscript or include style.
6969

7070
-h | -help
71-
Print a summary of available commands and exit. No hex dumping
71+
Print a summary of available commands and exit. No hex dumping
7272
is performed.
7373

7474
-i | -include
75-
Output in C include file style. A complete static array defini‐
76-
tion is written (named after the input file), unless xxd reads
75+
Output in C include file style. A complete static array defini‐
76+
tion is written (named after the input file), unless xxd reads
7777
from stdin.
7878

7979
-l len | -len len
8080
Stop after writing <len> octets.
8181

82+
-n name | -name name
83+
Override the variable name output when -i is used. The array is
84+
named name and the length is named name_len.
85+
8286
-o offset
8387
Add <offset> to the displayed file position.
8488

@@ -91,8 +95,8 @@ OPTIONS
9195
not writing to stdout, xxd writes into its output file without
9296
truncating it. Use the combination -r -p to read plain hexadeci‐
9397
mal dumps without line number information and without a particu‐
94-
lar column layout. Additional Whitespace and line-breaks are
95-
allowed anywhere.
98+
lar column layout. Additional Whitespace and line-breaks are al‐
99+
lowed anywhere.
96100

97101
-seek offset
98102
When used after -r: revert with <offset> added to file positions
@@ -209,8 +213,8 @@ EXAMPLES
209213
*
210214
000fffc: 0000 0000 40 ....A
211215

212-
Create a 1 byte file containing a single 'A' character. The number
213-
after '-r -s' adds to the linenumbers found in the file; in effect, the
216+
Create a 1 byte file containing a single 'A' character. The number af‐
217+
ter '-r -s' adds to the linenumbers found in the file; in effect, the
214218
leading bytes are suppressed.
215219
% echo "010000: 41" | xxd -r -s -0x10000 > file
216220

0 commit comments

Comments
 (0)