forked from macvim-dev/macvim
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'vim/master'
- Loading branch information
Showing
514 changed files
with
11,776 additions
and
3,400 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
The Python project that creates `vimlogo.svg` can be found at | ||
`https://github.com/ShayHill/vimlogo`. The Vim license applies. | ||
|
||
`vimlogo.svg` is an effort to remove errors and inadvertant inconsistencies | ||
from the original vim logo while maintaing the original design. `vimlogo.svg` | ||
is based on the `vimlogo.svg` file (previously?) found at | ||
`https://www.vim.org/logos.php` | ||
|
||
As of 2024 Jan 30, `vimlogo.svg` is a separate project from `vimlogo.cdr`, | ||
`vimlogo.eps`, `vimlogo.gif`, `vimlogo.pdf`, and `vimlogo.xpm`, all of which | ||
are slightly different from each other. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/usr/bin/env sh | ||
pushd /etc/apt/preferences.d/ | ||
cat > nosnap.pref <<EOF | ||
# To prevent repository packages from triggering the installation of snap, | ||
# this file forbids snapd from being installed by APT. | ||
Package: snapd | ||
Pin: release a=* | ||
Pin-Priority: -10 | ||
EOF | ||
popd | ||
snap remove --purge $(snap list | awk '!/^Name|^core/ {print $1}') | ||
apt-get purge -y snapd |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,8 +2,8 @@ vim9script | |
|
||
# Vim functions for file type detection | ||
# | ||
# Maintainer: The Vim Project <https://github.com/vim/vim> | ||
# Last Change: 2023 Aug 10 | ||
# Maintainer: The Vim Project <https://github.com/vim/vim> | ||
# Last Change: 2024 Jan 05 | ||
# Former Maintainer: Bram Moolenaar <[email protected]> | ||
|
||
# These functions are moved here from runtime/filetype.vim to make startup | ||
|
@@ -279,6 +279,19 @@ export def DtraceCheck() | |
endif | ||
enddef | ||
|
||
export def FTdef() | ||
if get(g:, "filetype_def", "") == "modula2" || IsModula2() | ||
SetFiletypeModula2() | ||
return | ||
endif | ||
|
||
if exists("g:filetype_def") | ||
exe "setf " .. g:filetype_def | ||
else | ||
setf def | ||
endif | ||
enddef | ||
|
||
export def FTe() | ||
if exists('g:filetype_euphoria') | ||
exe 'setf ' .. g:filetype_euphoria | ||
|
@@ -517,16 +530,53 @@ def IsLProlog(): bool | |
return getline(lnum) =~ '\<module\s\+\w\+\s*\.\s*\(%\|$\)' | ||
enddef | ||
|
||
def IsModula2(): bool | ||
return getline(nextnonblank(1)) =~ '\<MODULE\s\+\w\+\s*;\|^\s*(\*' | ||
enddef | ||
|
||
def SetFiletypeModula2() | ||
const KNOWN_DIALECTS = ["iso", "pim", "r10"] | ||
const KNOWN_EXTENSIONS = ["gm2"] | ||
const LINE_COUNT = 200 | ||
const TAG = '(\*!m2\(\w\+\)\%(+\(\w\+\)\)\=\*)' | ||
|
||
var dialect = get(g:, "modula2_default_dialect", "pim") | ||
var extension = get(g:, "modula2_default_extension", "") | ||
|
||
var matches = [] | ||
|
||
# ignore unknown dialects or badly formatted tags | ||
for lnum in range(1, min([line("$"), LINE_COUNT])) | ||
matches = matchlist(getline(lnum), TAG) | ||
if !empty(matches) | ||
if index(KNOWN_DIALECTS, matches[1]) >= 0 | ||
dialect = matches[1] | ||
endif | ||
if index(KNOWN_EXTENSIONS, matches[2]) >= 0 | ||
extension = matches[2] | ||
endif | ||
break | ||
endif | ||
endfor | ||
|
||
modula2#SetDialect(dialect, extension) | ||
|
||
setf modula2 | ||
enddef | ||
|
||
# Determine if *.mod is ABB RAPID, LambdaProlog, Modula-2, Modsim III or go.mod | ||
export def FTmod() | ||
if get(g:, "filetype_mod", "") == "modula2" || IsModula2() | ||
SetFiletypeModula2() | ||
return | ||
endif | ||
|
||
if exists("g:filetype_mod") | ||
exe "setf " .. g:filetype_mod | ||
elseif expand("<afile>") =~ '\<go.mod$' | ||
setf gomod | ||
elseif IsLProlog() | ||
setf lprolog | ||
elseif getline(nextnonblank(1)) =~ '\%(\<MODULE\s\+\w\+\s*;\|^\s*(\*\)' | ||
setf modula2 | ||
elseif IsRapid() | ||
setf rapid | ||
else | ||
|
@@ -1243,4 +1293,4 @@ export def FTvba() | |
enddef | ||
|
||
# Uncomment this line to check for compilation errors early | ||
# defcompile | ||
defcompile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
" Maintainer: Jason Franklin <[email protected]> | ||
" Maintainer: SungHyun Nam <[email protected]> | ||
" Autoload Split: Bram Moolenaar | ||
" Last Change: 2023 Jun 28 | ||
" Last Change: 2024 Jan 17 (make it work on AIX, see #13847) | ||
|
||
let s:cpo_save = &cpo | ||
set cpo-=C | ||
|
@@ -13,14 +13,26 @@ let s:man_tag_depth = 0 | |
let s:man_sect_arg = "" | ||
let s:man_find_arg = "-w" | ||
try | ||
if !has("win32") && $OSTYPE !~ 'cygwin\|linux' && system('uname -s') =~ "SunOS" && system('uname -r') =~ "^5" | ||
let s:man_sect_arg = "-s" | ||
let s:man_find_arg = "-l" | ||
if !has("win32") && $OSTYPE !~ 'cygwin\|linux' | ||
" cache the value | ||
let uname_s = system('uname -s') | ||
|
||
if uname_s =~ "SunOS" && system('uname -r') =~ "^5" | ||
" Special Case for Man on SunOS | ||
let s:man_sect_arg = "-s" | ||
let s:man_find_arg = "-l" | ||
elseif uname_s =~? 'AIX' | ||
" Special Case for Man on AIX | ||
let s:man_sect_arg = "" | ||
let s:man_find_arg = "" | ||
endif | ||
endif | ||
catch /E145:/ | ||
" Ignore the error in restricted mode | ||
endtry | ||
|
||
unlet! uname_s | ||
|
||
func s:ParseIntoPageAndSection() | ||
" Accommodate a reference that terminates in a hyphen. | ||
" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
" Vim filetype plugin file | ||
" Language: Modula-2 | ||
" Maintainer: Doug Kearns <[email protected]> | ||
" Last Change: 2024 Jan 04 | ||
|
||
" Dialect can be one of pim, iso, r10 | ||
function modula2#GetDialect() abort | ||
|
||
if exists("b:modula2.dialect") | ||
return b:modula2.dialect | ||
endif | ||
|
||
if exists("g:modula2_default_dialect") | ||
let dialect = g:modula2_default_dialect | ||
else | ||
let dialect = "pim" | ||
endif | ||
|
||
return dialect | ||
endfunction | ||
|
||
function modula2#SetDialect(dialect, extension = "") abort | ||
if exists("b:modula2") | ||
unlockvar! b:modula2 | ||
endif | ||
|
||
let b:modula2 = #{ dialect: a:dialect, extension: a:extension } | ||
lockvar! b:modula2 | ||
endfunction | ||
|
||
" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker: |
Oops, something went wrong.