Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all mentions of vim-json and vim-toml #602

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/vader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
${{ matrix.vimFlavor }} --version
- name: Fetch Vader and other dependencies
run: |
make build/tabular build/vim-toml build/vim-json build/vader.vim
make build/tabular build/vader.vim
- name: Run test suite
run: |
cd test
Expand Down
12 changes: 2 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,18 @@ install:
mkdir -pv ${REGISTRY}
cp -v registry/markdown.yaml ${REGISTRY}/markdown.yaml

test: build/tabular build/vim-toml build/vim-json build/vader.vim
test: build/tabular build/vader.vim
test/run-tests.sh
.PHONY: test

update: build/tabular build/vim-toml build/vim-json build/vader.vim
update: build/tabular build/vader.vim
cd build/tabular && git pull
cd build/vim-toml && git pull
cd build/vim-json && git pull
cd build/vader.vim && git pull
.PHONY: update

build/tabular: | build
git clone https://github.com/godlygeek/tabular build/tabular

build/vim-toml: | build
git clone https://github.com/cespare/vim-toml build/vim-toml

build/vim-json: | build
git clone https://github.com/elzr/vim-json build/vim-json

build/vader.vim: | build
git clone https://github.com/junegunn/vader.vim build/vader.vim

Expand Down
18 changes: 6 additions & 12 deletions doc/vim-markdown.txt
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,6 @@ TOML Front Matter ~
- 'g:vim_markdown_toml_frontmatter'

Highlight TOML front matter as used by Hugo [7].

TOML syntax highlight requires vim-toml [8].
>
let g:vim_markdown_toml_frontmatter = 1
<
Expand All @@ -373,8 +371,6 @@ JSON Front Matter ~
- 'g:vim_markdown_json_frontmatter'

Highlight JSON front matter as used by Hugo [7].

JSON syntax highlight requires vim-json [9].
>
let g:vim_markdown_json_frontmatter = 1
<
Expand Down Expand Up @@ -581,9 +577,9 @@ The following requires ':filetype plugin on'.
range.

*:TableFormat*
- ':TableFormat': Format the table under the cursor like this [10].
- ':TableFormat': Format the table under the cursor like this [8].

Requires Tabular [11].
Requires Tabular [9].

The input table _must_ already have a separator line as the second line of
the table. That line only needs to contain the correct pipes '|', nothing
Expand Down Expand Up @@ -612,7 +608,7 @@ Credits ~
The main contributors of vim-markdown are:

- **Ben Williams** (A.K.A. **plasticboy**). The original developer of vim-
markdown. Homepage [12].
markdown. Homepage [10].

If you feel that your name should be on this list, please make a pull request
listing your contributions.
Expand Down Expand Up @@ -654,10 +650,8 @@ References ~
[5] https://github.com/preservim/vim-markdown/archive/master.tar.gz
[6] https://github.com/klen/python-mode
[7] https://gohugo.io/content/front-matter/
[8] https://github.com/cespare/vim-toml
[9] https://github.com/elzr/vim-json
[10] http://www.cirosantilli.com/markdown-style-guide/#tables
[11] https://github.com/godlygeek/tabular
[12] http://plasticboy.com/
[8] http://www.cirosantilli.com/markdown-style-guide/#tables
[9] https://github.com/godlygeek/tabular
[10] http://plasticboy.com/

vim: ft=help
2 changes: 1 addition & 1 deletion test/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e

cd "$( dirname "${BASH_SOURCE[0]}" )"

for dep in ../build/tabular ../build/vim-toml ../build/vim-json ../build/vader.vim; do
for dep in ../build/tabular ../build/vader.vim; do
if [[ ! -d $dep ]]; then
echo "Missing dependency: $dep"
echo "You may just want to use 'make test'."
Expand Down
2 changes: 0 additions & 2 deletions test/vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ let $LANG='en_US'
filetype off
set runtimepath+=../
set runtimepath+=../build/tabular/
set runtimepath+=../build/vim-toml/
set runtimepath+=../build/vim-json/
set runtimepath+=../build/vader.vim/
filetype on

Expand Down