Skip to content

Commit

Permalink
Update runtime files
Browse files Browse the repository at this point in the history
  • Loading branch information
brammool committed Jul 1, 2022
1 parent 27efc62 commit 0d878b9
Show file tree
Hide file tree
Showing 20 changed files with 869 additions and 294 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -111,6 +111,7 @@ runtime/ftplugin/dosbatch.vim @mrdubya
runtime/ftplugin/eiffel.vim @dkearns
runtime/ftplugin/erlang.vim @hcs42
runtime/ftplugin/eruby.vim @tpope @dkearns
runtime/ftplugin/fetchmail.vim @dkearns
runtime/ftplugin/fpcmake.vim @dkearns
runtime/ftplugin/freebasic.vim @dkearns
runtime/ftplugin/fstab.vim @rid9
Expand Down Expand Up @@ -298,8 +299,10 @@ runtime/syntax/erlang.vim @hcs42
runtime/syntax/eruby.vim @tpope @dkearns
runtime/syntax/exports.vim @cecamp
runtime/syntax/falcon.vim @steveno
runtime/syntax/fetchmail.vim @dkearns
runtime/syntax/forth.vim @jkotlinski
runtime/syntax/fpcmake.vim @dkearns
runtime/syntax/freebasic.vim @dkearns
runtime/syntax/fstab.vim @rid9
runtime/syntax/git.vim @tpope
runtime/syntax/gitcommit.vim @tpope
Expand Down
2 changes: 1 addition & 1 deletion Filelist
Expand Up @@ -15,7 +15,6 @@ SRC_ALL = \
.gitignore \
.hgignore \
.lgtm.yml \
.travis.yml \
.appveyor.yml \
.codecov.yml \
ci/appveyor.bat \
Expand Down Expand Up @@ -1017,6 +1016,7 @@ LANG_GEN = \
runtime/spell/??/*.diff \
runtime/spell/??/main.aap \
runtime/spell/sr/README_sr.txt \
runtime/spell/sr/convert.vim \
runtime/spell/tet/*.diff \
runtime/spell/tet/main.aap \
runtime/spell/check/main.aap \
Expand Down
2 changes: 1 addition & 1 deletion README.md
@@ -1,6 +1,6 @@
[![Vim Logo](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)

[![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)
[![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)

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

Expand Down
7 changes: 3 additions & 4 deletions runtime/autoload/freebasic.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: FreeBASIC
" Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2021 Mar 16
" Last Change: 2022 June 24

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

" override with #lang directive or metacommand

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

let save_cursor = getcurpos()
call cursor(1, 1)
let lnum = search(pat, 'n', '', '', skip)
let lnum = search(pat, 'cn')
call setpos('.', save_cursor)

if lnum
let word = matchlist(getline(lnum), pat)[1]
if word =~? '\%(fb\|deprecated\|fblite\|qb\)'
if word =~? '\<\%(fb\|deprecated\|fblite\|qb\)\>'
let dialect = word
else
echomsg "freebasic#GetDialect: Invalid lang, found '" .. word .. "' at line " .. lnum .. " " .. getline(lnum)
Expand Down
19 changes: 19 additions & 0 deletions runtime/doc/filetype.txt
Expand Up @@ -556,12 +556,30 @@ For further discussion of fortran_have_tabs and the method used for the
detection of source format see |ft-fortran-syntax|.


FREEBASIC *ft-freebasic-plugin*

This plugin aims to treat the four FreeBASIC dialects, "fb", "qb", "fblite"
and "deprecated", as distinct languages.

The dialect will be set to the first name found in g:freebasic_forcelang, any
#lang directive or $lang metacommand in the file being edited, or finally
g:freebasic_lang. These global variables conceptually map to the fbc options
-forcelang and -lang. If no dialect is explicitly specified "fb" will be
used.

For example, to set the dialect to a default of "fblite" but still allow for
any #lang directive overrides, use the following command: >
let g:freebasic_lang = "fblite"
GIT COMMIT *ft-gitcommit-plugin*

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


GPROF *ft-gprof-plugin*

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

Options:
Expand Down
3 changes: 3 additions & 0 deletions runtime/doc/quickfix.txt
Expand Up @@ -568,6 +568,9 @@ pattern is used.
The |:Lfilter| command does the same as |:Cfilter| but operates on the current
location list.

The current quickfix/location list is not modified by these commands, so you
can go back to the unfiltered list using the |:colder|/|:lolder| command.

=============================================================================
2. The error window *quickfix-window*

Expand Down
15 changes: 15 additions & 0 deletions runtime/doc/syntax.txt
Expand Up @@ -1694,6 +1694,21 @@ because Fortran90 has no reserved words.
For further information related to fortran, see |ft-fortran-indent| and
|ft-fortran-plugin|.

FREEBASIC *freebasic.vim* *ft-freebasic-syntax*

FreeBASIC files will be highlighted differently for each of the four available
dialects, "fb", "qb", "fblite" and "deprecated". See |ft-freebasic-plugin|
for how to select the correct dialect.

Highlighting is further configurable via the following variables.

Variable Highlight ~
*freebasic_no_comment_fold* disable multiline comment folding
*freebasic_operators* non-alpha operators
*freebasic_space_errors* trailing white space and spaces before a <Tab>
*freebasic_type_suffixes* QuickBASIC style type suffixes



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

Expand Down
17 changes: 17 additions & 0 deletions runtime/doc/tags
Expand Up @@ -988,6 +988,7 @@ $quote eval.txt /*$quote*
't_Co' term.txt /*'t_Co'*
't_Cs' term.txt /*'t_Cs'*
't_DL' term.txt /*'t_DL'*
't_Ds' term.txt /*'t_Ds'*
't_EC' term.txt /*'t_EC'*
't_EI' term.txt /*'t_EI'*
't_F1' term.txt /*'t_F1'*
Expand Down Expand Up @@ -1044,6 +1045,7 @@ $quote eval.txt /*$quote*
't_TI' term.txt /*'t_TI'*
't_Te' term.txt /*'t_Te'*
't_Ts' term.txt /*'t_Ts'*
't_Us' term.txt /*'t_Us'*
't_VS' term.txt /*'t_VS'*
't_WP' term.txt /*'t_WP'*
't_WS' term.txt /*'t_WS'*
Expand All @@ -1059,6 +1061,7 @@ $quote eval.txt /*$quote*
't_da' term.txt /*'t_da'*
't_db' term.txt /*'t_db'*
't_dl' term.txt /*'t_dl'*
't_ds' term.txt /*'t_ds'*
't_fd' term.txt /*'t_fd'*
't_fe' term.txt /*'t_fe'*
't_fs' term.txt /*'t_fs'*
Expand Down Expand Up @@ -6875,6 +6878,11 @@ format-formatexpr change.txt /*format-formatexpr*
formatting change.txt /*formatting*
forth.vim syntax.txt /*forth.vim*
fortran.vim syntax.txt /*fortran.vim*
freebasic.vim syntax.txt /*freebasic.vim*
freebasic_no_comment_fold syntax.txt /*freebasic_no_comment_fold*
freebasic_operators syntax.txt /*freebasic_operators*
freebasic_space_errors syntax.txt /*freebasic_space_errors*
freebasic_type_suffixes syntax.txt /*freebasic_type_suffixes*
friendship intro.txt /*friendship*
frombook usr_01.txt /*frombook*
ft-abel-syntax syntax.txt /*ft-abel-syntax*
Expand Down Expand Up @@ -6931,6 +6939,8 @@ ft-forth-syntax syntax.txt /*ft-forth-syntax*
ft-fortran-indent indent.txt /*ft-fortran-indent*
ft-fortran-plugin filetype.txt /*ft-fortran-plugin*
ft-fortran-syntax syntax.txt /*ft-fortran-syntax*
ft-freebasic-plugin filetype.txt /*ft-freebasic-plugin*
ft-freebasic-syntax syntax.txt /*ft-freebasic-syntax*
ft-fvwm-syntax syntax.txt /*ft-fvwm-syntax*
ft-gitcommit-plugin filetype.txt /*ft-gitcommit-plugin*
ft-gprof-plugin filetype.txt /*ft-gprof-plugin*
Expand Down Expand Up @@ -9726,6 +9736,7 @@ t_Ce term.txt /*t_Ce*
t_Co term.txt /*t_Co*
t_Cs term.txt /*t_Cs*
t_DL term.txt /*t_DL*
t_Ds term.txt /*t_Ds*
t_EC term.txt /*t_EC*
t_EI term.txt /*t_EI*
t_F1 term.txt /*t_F1*
Expand Down Expand Up @@ -9782,6 +9793,7 @@ t_TE term.txt /*t_TE*
t_TI term.txt /*t_TI*
t_Te term.txt /*t_Te*
t_Ts term.txt /*t_Ts*
t_Us term.txt /*t_Us*
t_VS term.txt /*t_VS*
t_WP term.txt /*t_WP*
t_WS term.txt /*t_WS*
Expand All @@ -9808,6 +9820,7 @@ t_da term.txt /*t_da*
t_db term.txt /*t_db*
t_dict-variable eval.txt /*t_dict-variable*
t_dl term.txt /*t_dl*
t_ds term.txt /*t_ds*
t_ed version4.txt /*t_ed*
t_el version4.txt /*t_el*
t_f1 version4.txt /*t_f1*
Expand Down Expand Up @@ -10204,7 +10217,11 @@ u undo.txt /*u*
uganda uganda.txt /*uganda*
uganda.txt uganda.txt /*uganda.txt*
undercurl syntax.txt /*undercurl*
underdashed syntax.txt /*underdashed*
underdotted syntax.txt /*underdotted*
underdouble syntax.txt /*underdouble*
underline syntax.txt /*underline*
underline-codes syntax.txt /*underline-codes*
undo undo.txt /*undo*
undo-blocks undo.txt /*undo-blocks*
undo-branches undo.txt /*undo-branches*
Expand Down
22 changes: 10 additions & 12 deletions runtime/doc/todo.txt
Expand Up @@ -38,9 +38,6 @@ browser use: https://github.com/vim/vim/issues/1234
*known-bugs*
-------------------- Known bugs and current work -----------------------

Prepare for the Vim 9.0 release:
- Update version number in help

Further Vim9 improvements, possibly after launch:
- Use Vim9 for more runtime files.
- Check performance with callgrind and kcachegrind.
Expand Down Expand Up @@ -201,19 +198,11 @@ Terminal emulator window:
conversions.

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

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

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

Typed keys invisible after calling interrupt() from a timer. #10631

With a window height of 6 and 'scrolloff' set to 3, using "j" does not scroll
evenly. (#10545) Need to handle this in scroll_cursor_bot().

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

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

Version of getchar() that does not move the cursor - #10603 Use a separate
argument for the new flag.

test_arglist func Test_all_not_allowed_from_cmdwin() hangs on MS-Windows.

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

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

mksession uses :buffer instead of :edit in one place but not another. #10629

Add 'termguiattr' option, use "gui=" attributes in the terminal? Would work
with 'termguicolors'. #1740

Expand Down Expand Up @@ -4423,6 +4419,8 @@ GUI:


Autocommands:
9 Add WinNewPre - before creating a new window. #10635
9 When triggering WinNew provide the window ID somehow. #10633
9 Rework the code from FEAT_OSFILETYPE for autocmd-osfiletypes to use
'filetype'. Only for when the current buffer is known.
- Put autocommand event names in a hashtable for faster lookup?
Expand Down
26 changes: 15 additions & 11 deletions runtime/doc/xxd.man
Expand Up @@ -46,7 +46,7 @@ OPTIONS
long line of output.

-C | -capitalize
Capitalize variable names in C include file style, when using
Capitalize variable names in C include file style, when using
-i.

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

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

-h | -help
Print a summary of available commands and exit. No hex dumping
Print a summary of available commands and exit. No hex dumping
is performed.

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

-l len | -len len
Stop after writing <len> octets.

-n name | -name name
Override the variable name output when -i is used. The array is
named name and the length is named name_len.

-o offset
Add <offset> to the displayed file position.

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

-seek offset
When used after -r: revert with <offset> added to file positions
Expand Down Expand Up @@ -209,8 +213,8 @@ EXAMPLES
*
000fffc: 0000 0000 40 ....A

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

Expand Down

0 comments on commit 0d878b9

Please sign in to comment.